From 8b4e07a1eab06680714a89e78ad7cba5a5e3fa30 Mon Sep 17 00:00:00 2001 From: Lingzi Date: Wed, 23 Mar 2022 15:57:34 +0800 Subject: [PATCH 01/99] fix bug --- .../freight/list/detail/detail.component.html | 40 +++ .../components/freight/list/list.component.ts | 235 +++++------------- 2 files changed, 100 insertions(+), 175 deletions(-) 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 6880be7b..322866ce 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 @@ -354,6 +354,46 @@ [placeholder]="isEdit?'':'-'"> + + + 合伙人信息 + + + + + + + + + + + + + + + + 渠道销售信息 + + + + + + + + + + + + + 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 afb394a1..3ddef9e3 100644 --- a/src/app/routes/usercenter/components/freight/list/list.component.ts +++ b/src/app/routes/usercenter/components/freight/list/list.component.ts @@ -166,137 +166,6 @@ export class FreightComponentsListComponent implements OnInit { showRequired: false } }, - lockedStatus8: { - type: 'string', - title: '公司所在地', - enum: [ - { label: '全部', value: '' }, - { label: '物流企业', value: 0 } - ], - default: '', - ui: { - widget: 'select', - visibleIf: { - expand: (value: boolean) => value - } - } - }, - oftenUsedServices: { - type: 'string', - title: '常用服务', - enum: [ - { label: '全部', value: '' }, - { label: '整车服务', value: 0 }, - { label: '大宗服务', value: 1 } - ], - default: '', - ui: { - widget: 'select', - visibleIf: { - expand: (value: boolean) => value - } - } - }, - customerType: { - type: 'string', - title: '客户类型', - enum: [ - { label: '全部', value: '' }, - { label: '直客', value: 1 }, - { label: '渠道客户', value: 20 } - ], - default: '', - ui: { - widget: 'select', - visibleIf: { - expand: (value: boolean) => value - } - } - }, - contactName5: { - title: '渠道销售', - type: 'string', - ui: { - placeholder: '请输入', - showRequired: false, - visibleIf: { - expand: (value: boolean) => value - } - } - }, - partnerName: { - title: '合伙人', - type: 'string', - ui: { - placeholder: '请输入', - showRequired: false, - visibleIf: { - expand: (value: boolean) => value - } - } - }, - contactName3: { - title: '客服人员', - type: 'string', - ui: { - placeholder: '请输入', - showRequired: false, - visibleIf: { - expand: (value: boolean) => value - } - } - }, - contactName2: { - title: '审核人', - type: 'string', - ui: { - placeholder: '请输入', - showRequired: false, - visibleIf: { - expand: (value: boolean) => value - } - } - }, - applyDate: { - type: 'string', - title: '申请时间', - ui: { - widget: 'sl-from-to', - type: 'date', - format: 'yyyy-MM-dd', - visibleIf: { - expand: (value: boolean) => value - } - } as SFDateWidgetSchema, - }, - applyDate1: { - type: 'string', - title: '审核时间', - ui: { - widget: 'sl-from-to', - type: 'date', - format: 'yyyy-MM-dd', - visibleIf: { - expand: (value: boolean) => value - } - } as SFDateWidgetSchema, - }, - lockedStatus3: { - type: 'string', - title: '企业状态', - enum: [ - { label: '全部', value: '' }, - { label: '正常', value: 0 }, - { label: '冻结', value: 1 } - ], - default: '', - ui: { - widget: 'select', - visibleIf: { - expand: (value: boolean) => value - } - } - }, enterpriseType: { type: 'string', title: '企业类型', @@ -322,26 +191,41 @@ export class FreightComponentsListComponent implements OnInit { default: '', ui: { widget: 'select', - placeholder: '请选择', - allowClear: true, - asyncData: () => this.shipperservice.getNetworkFreightForwarder(), visibleIf: { expand: (value: boolean) => value } } }, - // sou1r3ce: { - // type: 'string', - // title: '客户类型', - // enum: [{ label: '全部', value: '' }], - // default: '', - // ui: { - // widget: 'select', - // visibleIf: { - // expand: (value: boolean) => value - // } - // } - // }, + oftenUsedServices: { + type: 'string', + title: '常用服务', + enum: [ + { label: '全部', value: '' }, + { label: '整车发货', value: 10 }, + { label: '大宗发货', value: 20 } + ], + default: '', + ui: { + widget: 'select', + visibleIf: { + expand: (value: boolean) => value + } + } + }, + customerType: { + type: 'string', + title: '客户类型', + enum: [{ label: '全部', value: '' }, + { label: '直客', value: 1 }, + { label: '渠道客户', value: 20 }], + default: '', + ui: { + widget: 'select', + visibleIf: { + expand: (value: boolean) => value + } + } + }, promotersTelephone: { title: '业务员', type: 'string', @@ -353,28 +237,28 @@ export class FreightComponentsListComponent implements OnInit { } } }, - // promotersTe1le3phone: { - // title: '合伙人', - // type: 'string', - // ui: { - // placeholder: '请输入', - // showRequired: false, - // visibleIf: { - // expand: (value: boolean) => value - // } - // } - // }, - // promotersTe1lep1hone: { - // title: '客服人员', - // type: 'string', - // ui: { - // placeholder: '请输入', - // showRequired: false, - // visibleIf: { - // expand: (value: boolean) => value - // } - // } - // }, + partnerNamee: { + title: '合伙人', + type: 'string', + ui: { + placeholder: '请输入', + showRequired: false, + visibleIf: { + expand: (value: boolean) => value + } + } + }, + customerServiceId: { + title: '客服人员', + type: 'string', + ui: { + placeholder: '请输入', + showRequired: false, + visibleIf: { + expand: (value: boolean) => value + } + } + }, approvalUserName: { title: '审核人', type: 'string', @@ -442,13 +326,13 @@ export class FreightComponentsListComponent implements OnInit { } } }, - source2: { + isExpired: { type: 'string', title: '证件是否过期', enum: [ { label: '全部', value: '' }, - { label: '是', value: 1 }, - { label: '否', value: 2 } + { label: '是', value: true }, + { label: '否', value: false } ], default: '', ui: { @@ -506,8 +390,8 @@ export class FreightComponentsListComponent implements OnInit { width: 140 }, { title: '业务员', className: 'text-center', render: 'promotersTelephone', width: 150 }, - // { title: '合伙人', className: 'text-center', render: 'promoter1sTelephone', width: 150 }, - // { title: '客服人员', className: 'text-center', render: 'promoter1sTelephone', width: 150 }, + { title: '合伙人', className: 'text-center', render: 'partnerName', width: 150 }, + { title: '客服人员', className: 'text-center', render: 'customerServiceId', width: 150 }, { title: '网络货运人', className: 'text-center', index: 'netTranName', width: 180 }, { title: '注册渠道', @@ -544,8 +428,9 @@ export class FreightComponentsListComponent implements OnInit { }, { title: '操作', - width: '250px', - className: 'text-center btnBox', + width: '200px', + className: 'text-center block-td', + fixed: 'right', buttons: [ { text: '查看', From b9c099d2836ed6d96462e1ce76124942ccba703e Mon Sep 17 00:00:00 2001 From: Lingzi Date: Wed, 23 Mar 2022 16:58:34 +0800 Subject: [PATCH 02/99] fix bug --- .../freight/list/detail/detail.component.html | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) 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 322866ce..759eb4d3 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 @@ -377,22 +377,18 @@ 渠道销售信息 - + - + - + - - - From 1d3f903801d5e9a80959059eab591c7e24a83e6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=98=E6=99=93=E4=BA=91?= Date: Wed, 23 Mar 2022 19:11:22 +0800 Subject: [PATCH 03/99] - --- .../recorded-detail.component.ts | 5 +- src/assets/mocks/menu-data.json | 1667 +++++++---------- 2 files changed, 648 insertions(+), 1024 deletions(-) diff --git a/src/app/routes/partner/account-management/components/recorded-detail/recorded-detail.component.ts b/src/app/routes/partner/account-management/components/recorded-detail/recorded-detail.component.ts index f6bc1b47..e86373e0 100644 --- a/src/app/routes/partner/account-management/components/recorded-detail/recorded-detail.component.ts +++ b/src/app/routes/partner/account-management/components/recorded-detail/recorded-detail.component.ts @@ -56,8 +56,7 @@ export class PartnerAccountManagementRecordedDetailComponent implements OnInit { initSF() { this.schema = { properties: { - - abnormalCause: { + ltdName: { title: '网络货运人', type: 'string', ui: { @@ -78,7 +77,7 @@ export class PartnerAccountManagementRecordedDetailComponent implements OnInit { { title: '网络货运人', index: 'ltdName', className: 'text-center', width: 200 }, { title: '银行类型', render: 'bankTypeLabel', className: 'text-center', width: 150 }, { title: '虚拟账户', render: 'fictitiousAccount', className: 'text-center', width: 200 }, - { title: '返佣总额（元）', index: 'totalRebate', className: 'text-center', width: 120, type: 'currency' }, + { title: '返佣总额（元）', index: 'totalRebate', className: 'text-center', width: 180, type: 'currency' }, { title: '已入账金额（元）', index: 'recordedAmount', className: 'text-center', width: 180, type: 'currency' }, { title: '代缴个税（元）', index: 'taxPersonalSum', className: 'text-center', width: 180, type: 'currency' }, { title: '待入账金额（元）', index: 'waitRecordedAmount', className: 'text-right', width: 180, type: 'currency' }, diff --git a/src/assets/mocks/menu-data.json b/src/assets/mocks/menu-data.json index a55bcd70..25563c4a 100644 --- a/src/assets/mocks/menu-data.json +++ b/src/assets/mocks/menu-data.json @@ -1,1025 +1,650 @@ { "success": true, "data": { - "menu": [ - { - "text": "主导航", - "hideInBreadcrumb": true, - "children": [ - { - "text": "用户中心", - "icon": "iconfont icon-yonghu-copy", - "group": true, - "children": [ - { - "text": "货主管理", - "children": [ - { - "text": "企业列表", - "link": "/usercenter/freight/list" - }, - { - "text": "道运证", - "hide": true, - "link": "/usercenter/freight/list/view/:id" - }, - { - "text": "货主详情", - "hide": true, - "link": "/usercenter/freight/list/detail/:id" - }, - { - "text": "企业认证", - "hide": true, - "link": "/usercenter/freight/new" - }, - { - "text": "企业审核列表", - "link": "/usercenter/freight/enterprise" - }, - { - "text": "企业审核列表详情", - "hide": true, - "link": "/usercenter/freight/enterprise/view/:id" - }, - { - "text": "货主员工列表", - "link": "/usercenter/freight/user" - }, - { - "text": "货主员工详情", - "hide": true, - "link": "/usercenter/freight/user/view/:id" - } - ] - }, - { - "text": "司机管理", - "link": "/demo/zorro", - "children": [ - { - "text": "司机列表", - "link": "/usercenter/driver" - }, - { - "text": "司机详情", - "hide": true, - "link": "/usercenter/driver/detail/:id" - }, - { - "text": "车队长列表", - "link": "/usercenter/driver/captain" - }, - { - "text": "司机配置", - "link": "/usercenter/driver/config" - } - ] - } - ] - }, - { - "text": "运力管理", - "icon": "iconfont icon-yunli-copy", - "group": true, - "children": [ - { - "text": "车辆列表", - "link": "/vehicle/list" - }, - { - "hide": true, - "text": "车辆列表详情", - "link": "/vehicle/list/detail/:id" - }, - { - "text": "车辆审核列表", - "link": "/vehicle/audit" - }, - { - "hide": true, - "text": "车辆审核列表详情", - "link": "/vehicle/audit/detail/:id" - } - ] - }, - { - "text": "货源管理", - "icon": "iconfont icon-huoyuan-copy", - "group": true, - "children": [ - { - "text": "货源管理", - "link": "/supply-management/index", - "reuse": true - }, - { - "text": "货源详情", - "link": "/supply-management/bulk-detail", - "hide": true - }, - { - "text": "修改货源", - "link": "/supply-management/vehicle-amend/:id", - "hide": true - }, - { - "text": "整车代发货源", - "link": "/supply-management/vehicle-release", - "hide": true - }, - { - "text": "大宗代发货源", - "link": "/supply-management/bulk-release", - "hide": true - }, - { - "text": "货源详情", - "link": "/supply-management/vehicle-detail/:id", - "hide": true - } - ] - }, - { - "text": "订单管理", - "icon": "iconfont icon-dingdan-copy", - "group": true, - "children": [ - { - "text": "整车订单", - "link": "/order-management/vehicle" - }, - { - "text": "大宗订单", - "link": "/order-management/bulk" - }, - { - "text": "风险单管理", - "link": "/order-management/risk" - }, - { - "text": "单据审核", - "link": "/order-management/receipts-audit" - }, - { - "text": "投诉管理", - "link": "/order-management/complaint" - }, - { - "text": "合规抽查", - "link": "/order-management/compliance-audit" - }, - { - "text": "整车订单详情", - "link": "/order-management/vehicle-detail/:id", - "hide": true - }, - { - "text": "大宗订单详情", - "link": "/order-management/bulk-detail/:id", - "hide": true - } - ] - }, - { - "text": "运单管理", - "icon": "iconfont icon-yundan-copy", - "group": true, - "children": [ - { - "text": "整车运单", - "link": "/waybill-management/vehicle" - }, - { - "hide": true, - "text": "整车运单详情", - "link": "/waybill-management/vehicle-detail/:id" - }, - { - "text": "大宗运单", - "link": "/waybill-management/bulk" - }, - { - "hide": true, - "text": "大宗运单详情", - "link": "/waybill-management/bulk-detail/:id" - }, - { - "text": "异常上报", - "link": "/waybill-management/abnormal-appear" - } - ] - }, - { - "text": "保险管理", - "icon": "iconfont icon-yundan-copy", - "group": true, - "children": [ - { - "text": "保险列表", - "link": "/insurance-management/list" - } - ] - }, - { - "text": "财务管理", - "icon": "iconfont icon-caiwu-copy", - "group": true, - "children": [ - { - "text": "费用管理", - "link": "/financial-management/cost-management" - }, - { - "text": "费用浏览", - "hide": true, - "link": "/financial-management/cost-management/detail/:id" - }, - { - "text": "凭证管理", - "link": "/financial-management/voucher-management" - }, - { - "text": "凭证汇总", - "link": "/financial-management/voucher-summary" - }, - { - "text": "应收费用单", - "hide": true, - "link": "/financial-management/cost-management/expenses-receivable/:id" - }, - { - "text": "应付费用单", - "hide": true, - "link": "/financial-management/cost-management/expenses-payable/:id" - }, - { - "text": "付款单", - "link": "/financial-management/payment-order" - }, - { - "text": "收款单", - "link": "/financial-management/receipt-order" - }, - { - "text": "应收核销", - "link": "/financial-management/receivable-order" - }, - { - "text": "应收核销详情", - "hide": true, - "link": "/financial-management/receivable-order/detail/:id" - }, - { - "text": "应付核销", - "link": "/financial-management/payable-order" - }, - { - "text": "应收核销详情", - "hide": true, - "link": "/financial-management/payable-order/detail/:id" - }, - { - "text": "货主账户", - "link": "/financial-management/freight-account" - }, - { - "text": "货主账户详情", - "hide": true, - "link": "/financial-management/freight-account/detail/:id" - }, - { - "text": "平台账户", - "link": "/financial-management/platform-account" - }, - { - "text": "司机账户", - "link": "/financial-management/driver-account" - }, - { - "text": "司机账户详情", - "hide": true, - "link": "/financial-management/driver-account/detail/:id" - }, - { - "text": "充值记录", - "link": "/financial-management/recharge-record" - }, - { - "text": "提现记录", - "link": "/financial-management/withdrawals-record" - }, - { - "text": "提现详情", - "hide": true, - "link": "/financial-management/withdrawals-record/detail/:id" - }, - { - "text": "异常入金", - "link": "/financial-management/abnormal-gold" - }, - { - "text": "支付记录", - "link": "/financial-management/payment-record" - }, - { - "text": "交易流水", - "link": "/financial-management/transaction-flow" - } - ] - }, - { - "text": "票务管理", - "icon": "iconfont icon-piaowu-copy", - "group": true, - "children": [ - { - "text": "销项发票", - "children": [ - { - "text": "开票申请", - "link": "/ticket/invoice-requested" - }, - { - "text": "开票订单明细", - "link": "/ticket/invoice-requested/detail/:id", - "hide": true - }, - { - "text": "销票处理", - "link": "/ticket/cancellation-invoice" - }, - { - "text": "销票订单明细", - "link": "/ticket/cancellation-invoice/detail/:id", - "hide": true - }, - { - "text": "已开发票", - "link": "/ticket/invoice-list" - }, - { - "text": "已开订单明细", - "link": "/ticket/invoice-list/detail/:id", - "hide": true - }, - { - "text": "快递信息", - "link": "/ticket/express-info" - } - ] - }, - { - "text": "ETC发票", - "children": [ - { - "text": "申请发票", - "link": "/ticket/etc-invoice-requested" - }, - { - "text": "开票记录", - "link": "/ticket/etc-invoice-list" - }, - { - "text": "已开发票", - "link": "/ticket/etc-invoiced-logs" - }, - { - "text": "ETC白名单", - "link": "/ticket/etc-blacklist" - } - ] - }, - { - "text": "进项发票", - "link": "/ticket/input-invoice" - }, - { - "text": "修改收票信息", - "link": "/ticket/input-invoice/detail/:id", - "hide": true - }, - { - "text": "进项发票", - "link": "/ticket/input-invoice/edit/:id", - "hide": true - } - ] - }, - { - "text": "合同管理", - "icon": "iconfont icon-hetong-copy", - "group": true, - "children": [ - { - "text": "保单管理", - "link": "/contract-management/policy" - }, - { - "text": "合同管理", - "link": "/contract-management/index" - }, - { - "text": "合同模板", - "link": "/contract-management/template" - } - ] - }, - { - "text": "系统设置", - "icon": "iconfont icon-shezhi-copy", - "group": true, - "children": [ - { - "text": "员工管理", - "group": true, - "children": [ - { - "text": "员工管理", - "link": "/system/staff-management" - }, - { - "text": "角色管理", - "link": "/system/role-management" - } - ] - }, - { - "text": "操作日志", - "group": true, - "children": [ - { - "text": "系统操作日志", - "link": "/logs/system-logs" - }, - { - "text": "货源操作日志", - "link": "/logs/system-supply-logs" - }, - { - "text": "订单操作日志", - "link": "/logs/system-waybill-logs" - }, - { - "text": "用户登录日志", - "link": "/logs/user-logs" - }, - { - "text": "版本发布记录", - "link": "/logs/version-logs" - } - ] - }, - { - "text": "CRM客户管理", - "link": "/system/crm-management" - }, - { - "text": "结算客户管理", - "link": "/system/close-account" - }, - { - "text": "网络货运人", - "link": "/system/network-freight" - }, - { - "text": "基础设置", - "link": "/system/basic-setting" - }, - { - "text": "保险配置", - "link": "/system/insurance-set" - }, - { - "text": "公告信息管理", - "link": "/system/announcement-message" - }, - { - "text": "车型车长配置", - "link": "/system/cart-config" - }, - { - "text": "基础配置", - "link": "/system/basic-config" - }, - { - "text": "协议配置", - "link": "/system/agreement-config" - }, - { - "text": "菜单管理", - "link": "/menu-management/index" - }, - { - "text": "接口权限", - "link": "/menu-management/auth" - }, - { - "text": "系统配置", - "link": "/system/system-config" - }, - { - "text": "货物名称配置", - "link": "/system/goods-name-config" - } - ] - }, - { - "text": "合伙人管理", - "icon": "anticon anticon-dashboard", - "children": [ - { - "text": "合伙人列表", - "link": "/partner/partner-list" - }, - { - "text": "业务统计", - "link": "/partner/business-statistics/index" - }, - { - "text": "返佣管理", - "group": true, - "children": [ - { - "text": "返佣配置", - "link": "/partner/rebate/setting" - }, - { - "text": "返佣明细", - "link": "/partner/rebate/particulars" - }, - { - "text": "返佣记录", - "link": "/partner/rebate/record" - } - ] - }, - { - "text": "销售渠道管理", - "link": "/partner/channel-sales/list" - }, - { - "text": "等级配置", - "link": "/partner/level-config/list" - }, - { - "text": "账户管理", - "group": true, - "children": [ - { - "text": "账户管理", - "link": "/partner/account-management/am/list" - }, - { - "text": "账户明细", - "link": "/partner/account-management/am/detail/:id", - "hide": true - }, - { - "text": "提现记录", - "link": "/partner/account-management/withdraw-record" - }, - { - "text": "提现详情", - "link": "/partner/account-management/withdraw-record/detail/:id", - "hide": true - }, - { - "text": "待入账明细", - "link": "/partner/account-management/am/recorded/detail/:id", - "hide": true - } - ] - }, - { - "text": "客户认领审核", - "link": "/partner/claim-audit/list" - }, - { - "text": "合伙人客户认领详情", - "link": "/partner/claim-audit/partner-detail", - "hide": true - }, - { - "text": "渠道销售客户认领详情", - "link": "/partner/claim-audit/channel-detail", - "hide": true - }, - { - "text": "入账记录", - "link": "/partner/recorded/record" - }, - { - "text": "入账详情", - "link": "/partner/recorded/record/:id", - "hide": true - }, - { - "text": "轮播图管理", - "link": "/partner/scroll-img/list" - }, - { - "text": "建议反馈管理", - "link": "/partner/advice-feedback/list" - }, - { - "text": "建议反馈管理详情", - "link": "/partner/advice-feedback/detail", - "hide": true - }, - { - "text": "知识库管理", - "icon": "iconfont icon-yundan-copy", - "group": true, - "children": [ - { - "text": "banner管理", - "link": "/partner/knowledge/banner", - "children": [ - { - "text": "新增banner", - "link": "/partner/knowledge/banner/detail" - } - ] - }, - { - "text": "文章管理", - "link": "/partner/knowledge/article-management-list" - }, - { - "text": "新增文章", - "link": "/partner/knowledge/article-management-add", - "hide": true - }, - { - "text": "编辑文章", - "link": "/partner/knowledge/article-management-edit", - "hide": true - } - ] - }, - { - "text": "运单管理", - "icon": "iconfont icon-yundan-copy", - "group": true, - "children": [ - { - "text": "整车运单", - "link": "/waybill-management/vehicle" - }, - { - "hide": true, - "text": "整车运单详情", - "link": "/waybill-management/vehicle-detail/:id" - }, - { - "text": "大宗运单", - "link": "/waybill-management/bulk" - }, - { - "hide": true, - "text": "大宗运单详情", - "link": "/waybill-management/bulk-detail/:id" - }, - { - "text": "异常上报", - "link": "/waybill-management/abnormal-appear" - } - ] - }, - { - "text": "保险管理", - "icon": "iconfont icon-yundan-copy", - "group": true, - "children": [ - { - "text": "保险列表", - "link": "/insurance-management/list" - } - ] - }, - { - "text": "财务管理", - "icon": "iconfont icon-caiwu-copy", - "group": true, - "children": [ - { - "text": "费用管理", - "link": "/financial-management/cost-management" - }, - { - "text": "费用浏览", - "hide": true, - "link": "/financial-management/cost-management/detail/:id" - }, - { - "text": "凭证管理", - "link": "/financial-management/voucher-management" - }, - { - "text": "凭证汇总", - "link": "/financial-management/voucher-summary" - }, - { - "text": "应收费用单", - "hide": true, - "link": "/financial-management/cost-management/expenses-receivable/:id" - }, - { - "text": "应付费用单", - "hide": true, - "link": "/financial-management/cost-management/expenses-payable/:id" - }, - { - "text": "付款单", - "link": "/financial-management/payment-order" - }, - { - "text": "收款单", - "link": "/financial-management/receipt-order" - }, - { - "text": "应收核销", - "link": "/financial-management/receivable-order" - }, - { - "text": "应收核销详情", - "hide": true, - "link": "/financial-management/receivable-order/detail/:id" - }, - { - "text": "应付核销", - "link": "/financial-management/payable-order" - }, - { - "text": "应收核销详情", - "hide": true, - "link": "/financial-management/payable-order/detail/:id" - }, - { - "text": "货主账户", - "link": "/financial-management/freight-account" - }, - { - "text": "货主账户详情", - "hide": true, - "link": "/financial-management/freight-account/detail/:id" - }, - { - "text": "平台账户", - "link": "/financial-management/platform-account" - }, - { - "text": "司机账户", - "link": "/financial-management/driver-account" - }, - { - "text": "司机账户详情", - "hide": true, - "link": "/financial-management/driver-account/detail/:id" - }, - { - "text": "充值记录", - "link": "/financial-management/recharge-record" - }, - { - "text": "提现记录", - "link": "/financial-management/withdrawals-record" - }, - { - "text": "提现详情", - "hide": true, - "link": "/financial-management/withdrawals-record/detail/:id" - }, - { - "text": "异常入金", - "link": "/financial-management/abnormal-gold" - }, - { - "text": "支付记录", - "link": "/financial-management/payment-record" - }, - { - "text": "交易流水", - "link": "/financial-management/transaction-flow" - } - ] - }, - { - "text": "票务管理", - "icon": "iconfont icon-piaowu-copy", - "group": true, - "children": [ - { - "text": "销项发票", - "children": [ - { - "text": "开票申请", - "link": "/ticket/invoice-requested" - }, - { - "text": "开票订单明细", - "link": "/ticket/invoice-requested/detail/:id", - "hide": true - }, - { - "text": "销票处理", - "link": "/ticket/cancellation-invoice" - }, - { - "text": "销票订单明细", - "link": "/ticket/cancellation-invoice/detail/:id", - "hide": true - }, - { - "text": "已开发票", - "link": "/ticket/invoice-list" - }, - { - "text": "已开订单明细", - "link": "/ticket/invoice-list/detail/:id", - "hide": true - }, - { - "text": "快递信息", - "link": "/ticket/express-info" - } - ] - }, - { - "text": "ETC发票", - "children": [ - { - "text": "申请发票", - "link": "/ticket/etc-invoice-requested" - }, - { - "text": "开票记录", - "link": "/ticket/etc-invoice-list" - }, - { - "text": "已开发票", - "link": "/ticket/etc-invoiced-logs" - }, - { - "text": "ETC白名单", - "link": "/ticket/etc-blacklist" - } - ] - }, - { - "text": "进项发票", - "link": "/ticket/input-invoice" - }, - { - "text": "修改收票信息", - "link": "/ticket/input-invoice/detail/:id", - "hide": true - }, - { - "text": "进项发票", - "link": "/ticket/input-invoice/edit/:id", - "hide": true - } - ] - }, - { - "text": "合同管理", - "icon": "iconfont icon-hetong-copy", - "group": true, - "children": [ - { - "text": "保单管理", - "link": "/contract-management/policy" - }, - { - "text": "合同管理", - "link": "/contract-management/index" - }, - { - "text": "合同模板", - "link": "/contract-management/template" - } - ] - }, - { - "text": "系统设置", - "icon": "iconfont icon-shezhi-copy", - "group": true, - "children": [ - { - "text": "员工管理", - "group": true, - "children": [ - { - "text": "员工管理", - "link": "/system/staff-management" - }, - { - "text": "角色管理", - "link": "/system/role-management" - } - ] - }, - { - "text": "操作日志", - "group": true, - "children": [ - { - "text": "系统操作日志", - "link": "/logs/system-logs" - }, - { - "text": "货源操作日志", - "link": "/logs/system-supply-logs" - }, - { - "text": "订单操作日志", - "link": "/logs/system-waybill-logs" - }, - { - "text": "用户登录日志", - "link": "/logs/user-logs" - }, - { - "text": "版本发布记录", - "link": "/logs/version-logs" - } - ] - }, - { - "text": "CRM客户管理", - "link": "/system/crm-management" - }, - { - "text": "短信管理", - "link": "/system/note-management" - }, - { - "text": "结算客户管理", - "link": "/system/close-account" - }, - { - "text": "网络货运人", - "link": "/system/network-freight" - }, - { - "text": "基础设置", - "link": "/system/basic-setting" - }, - { - "text": "保险配置", - "link": "/system/insurance-set" - }, - { - "text": "公告信息管理", - "link": "/system/announcement-message" - }, - { - "text": "车型车长配置", - "link": "/system/cart-config" - }, - { - "text": "基础配置", - "link": "/system/basic-config" - }, - { - "text": "协议配置", - "link": "/system/agreement-config" - }, - { - "text": "菜单管理", - "link": "/menu-management/index" - }, - { - "text": "接口权限", - "link": "/menu-management/auth" - }, - { - "text": "系统配置", - "link": "/system/system-config" - }, - { - "text": "分类管理", - "link": "/partner/knowledge/classification" - } - ] - } - ] - }, - { - "text": "数据监管", - "icon": "iconfont icon-hetong-copy", - "group": true, - "children": [ - { - "text": "数据报表", - "link": "/regulatory-data/dashboard" - } - ] - } - ] - } - ] + "menu": [{ + "text": "主导航", + "hideInBreadcrumb": true, + "children": [{ + "text": "用户中心", + "icon": "iconfont icon-yonghu-copy", + "group": true, + "children": [{ + "text": "货主管理", + "children": [{ + "text": "企业列表", + "link": "/usercenter/freight/list" + }, + { + "text": "道运证", + "hide": true, + "link": "/usercenter/freight/list/view/:id" + }, + { + "text": "货主详情", + "hide": true, + "link": "/usercenter/freight/list/detail/:id" + }, + { + "text": "企业认证", + "hide": true, + "link": "/usercenter/freight/new" + }, + { + "text": "企业审核列表", + "link": "/usercenter/freight/enterprise" + }, + { + "text": "企业审核列表详情", + "hide": true, + "link": "/usercenter/freight/enterprise/view/:id" + }, + { + "text": "货主员工列表", + "link": "/usercenter/freight/user" + }, + { + "text": "货主员工详情", + "hide": true, + "link": "/usercenter/freight/user/view/:id" + } + ] + }, + { + "text": "司机管理", + "link": "/demo/zorro", + "children": [{ + "text": "司机列表", + "link": "/usercenter/driver" + }, + { + "text": "司机详情", + "hide": true, + "link": "/usercenter/driver/detail/:id" + }, + { + "text": "车队长列表", + "link": "/usercenter/driver/captain" + }, + { + "text": "司机配置", + "link": "/usercenter/driver/config" + } + ] + } + ] + }, + { + "text": "运力管理", + "icon": "iconfont icon-yunli-copy", + "group": true, + "children": [{ + "text": "车辆列表", + "link": "/vehicle/list" + }, + { + "hide": true, + "text": "车辆列表详情", + "link": "/vehicle/list/detail/:id" + }, + { + "text": "车辆审核列表", + "link": "/vehicle/audit" + }, + { + "hide": true, + "text": "车辆审核列表详情", + "link": "/vehicle/audit/detail/:id" + } + ] + }, + { + "text": "货源管理", + "icon": "iconfont icon-huoyuan-copy", + "group": true, + "children": [{ + "text": "货源管理", + "link": "/supply-management/index", + "reuse": true + }, + { + "text": "货源详情", + "link": "/supply-management/bulk-detail", + "hide": true + }, + { + "text": "修改货源", + "link": "/supply-management/vehicle-amend/:id", + "hide": true + }, + { + "text": "整车代发货源", + "link": "/supply-management/vehicle-release", + "hide": true + }, + { + "text": "大宗代发货源", + "link": "/supply-management/bulk-release", + "hide": true + }, + { + "text": "货源详情", + "link": "/supply-management/vehicle-detail/:id", + "hide": true + } + ] + }, + { + "text": "订单管理", + "icon": "iconfont icon-dingdan-copy", + "group": true, + "children": [{ + "text": "整车订单", + "link": "/order-management/vehicle" + }, + { + "text": "大宗订单", + "link": "/order-management/bulk" + }, + { + "text": "风险单管理", + "link": "/order-management/risk" + }, + { + "text": "单据审核", + "link": "/order-management/receipts-audit" + }, + { + "text": "投诉管理", + "link": "/order-management/complaint" + }, + { + "text": "合规抽查", + "link": "/order-management/compliance-audit" + }, + { + "text": "整车订单详情", + "link": "/order-management/vehicle-detail/:id", + "hide": true + }, + { + "text": "大宗订单详情", + "link": "/order-management/bulk-detail/:id", + "hide": true + } + ] + }, + { + "text": "运单管理", + "icon": "iconfont icon-yundan-copy", + "group": true, + "children": [{ + "text": "整车运单", + "link": "/waybill-management/vehicle" + }, + { + "hide": true, + "text": "整车运单详情", + "link": "/waybill-management/vehicle-detail/:id" + }, + { + "text": "大宗运单", + "link": "/waybill-management/bulk" + }, + { + "hide": true, + "text": "大宗运单详情", + "link": "/waybill-management/bulk-detail/:id" + }, + { + "text": "异常上报", + "link": "/waybill-management/abnormal-appear" + } + ] + }, + { + "text": "保险管理", + "icon": "iconfont icon-yundan-copy", + "group": true, + "children": [{ + "text": "保险列表", + "link": "/insurance-management/list" + }] + }, + { + "text": "财务管理", + "icon": "iconfont icon-caiwu-copy", + "group": true, + "children": [{ + "text": "费用管理", + "link": "/financial-management/cost-management" + }, + { + "text": "费用浏览", + "hide": true, + "link": "/financial-management/cost-management/detail/:id" + }, + { + "text": "凭证管理", + "link": "/financial-management/voucher-management" + }, + { + "text": "凭证汇总", + "link": "/financial-management/voucher-summary" + }, + { + "text": "应收费用单", + "hide": true, + "link": "/financial-management/cost-management/expenses-receivable/:id" + }, + { + "text": "应付费用单", + "hide": true, + "link": "/financial-management/cost-management/expenses-payable/:id" + }, + { + "text": "付款单", + "link": "/financial-management/payment-order" + }, + { + "text": "收款单", + "link": "/financial-management/receipt-order" + }, + { + "text": "应收核销", + "link": "/financial-management/receivable-order" + }, + { + "text": "应收核销详情", + "hide": true, + "link": "/financial-management/receivable-order/detail/:id" + }, + { + "text": "应付核销", + "link": "/financial-management/payable-order" + }, + { + "text": "应收核销详情", + "hide": true, + "link": "/financial-management/payable-order/detail/:id" + }, + { + "text": "货主账户", + "link": "/financial-management/freight-account" + }, + { + "text": "货主账户详情", + "hide": true, + "link": "/financial-management/freight-account/detail/:id" + }, + { + "text": "平台账户", + "link": "/financial-management/platform-account" + }, + { + "text": "司机账户", + "link": "/financial-management/driver-account" + }, + { + "text": "司机账户详情", + "hide": true, + "link": "/financial-management/driver-account/detail/:id" + }, + { + "text": "充值记录", + "link": "/financial-management/recharge-record" + }, + { + "text": "提现记录", + "link": "/financial-management/withdrawals-record" + }, + { + "text": "提现详情", + "hide": true, + "link": "/financial-management/withdrawals-record/detail/:id" + }, + { + "text": "异常入金", + "link": "/financial-management/abnormal-gold" + }, + { + "text": "支付记录", + "link": "/financial-management/payment-record" + }, + { + "text": "交易流水", + "link": "/financial-management/transaction-flow" + } + ] + }, + { + "text": "票务管理", + "icon": "iconfont icon-piaowu-copy", + "group": true, + "children": [{ + "text": "销项发票", + "children": [{ + "text": "开票申请", + "link": "/ticket/invoice-requested" + }, + { + "text": "开票订单明细", + "link": "/ticket/invoice-requested/detail/:id", + "hide": true + }, + { + "text": "销票处理", + "link": "/ticket/cancellation-invoice" + }, + { + "text": "销票订单明细", + "link": "/ticket/cancellation-invoice/detail/:id", + "hide": true + }, + { + "text": "已开发票", + "link": "/ticket/invoice-list" + }, + { + "text": "已开订单明细", + "link": "/ticket/invoice-list/detail/:id", + "hide": true + }, + { + "text": "快递信息", + "link": "/ticket/express-info" + } + ] + }, + { + "text": "ETC发票", + "children": [{ + "text": "申请发票", + "link": "/ticket/etc-invoice-requested" + }, + { + "text": "开票记录", + "link": "/ticket/etc-invoice-list" + }, + { + "text": "已开发票", + "link": "/ticket/etc-invoiced-logs" + }, + { + "text": "ETC白名单", + "link": "/ticket/etc-blacklist" + } + ] + }, + { + "text": "进项发票", + "link": "/ticket/input-invoice" + }, + { + "text": "修改收票信息", + "link": "/ticket/input-invoice/detail/:id", + "hide": true + }, + { + "text": "进项发票", + "link": "/ticket/input-invoice/edit/:id", + "hide": true + } + ] + }, + { + "text": "合同管理", + "icon": "iconfont icon-hetong-copy", + "group": true, + "children": [{ + "text": "保单管理", + "link": "/contract-management/policy" + }, + { + "text": "合同管理", + "link": "/contract-management/index" + }, + { + "text": "合同模板", + "link": "/contract-management/template" + } + ] + }, + { + "text": "系统设置", + "icon": "iconfont icon-shezhi-copy", + "group": true, + "children": [{ + "text": "员工管理", + "group": true, + "children": [{ + "text": "员工管理", + "link": "/system/staff-management" + }, + { + "text": "角色管理", + "link": "/system/role-management" + } + ] + }, + { + "text": "操作日志", + "group": true, + "children": [{ + "text": "系统操作日志", + "link": "/logs/system-logs" + }, + { + "text": "货源操作日志", + "link": "/logs/system-supply-logs" + }, + { + "text": "订单操作日志", + "link": "/logs/system-waybill-logs" + }, + { + "text": "用户登录日志", + "link": "/logs/user-logs" + }, + { + "text": "版本发布记录", + "link": "/logs/version-logs" + } + ] + }, + { + "text": "CRM客户管理", + "link": "/system/crm-management" + }, + { + "text": "结算客户管理", + "link": "/system/close-account" + }, + { + "text": "网络货运人", + "link": "/system/network-freight" + }, + { + "text": "基础设置", + "link": "/system/basic-setting" + }, + { + "text": "保险配置", + "link": "/system/insurance-set" + }, + { + "text": "公告信息管理", + "link": "/system/announcement-message" + }, + { + "text": "车型车长配置", + "link": "/system/cart-config" + }, + { + "text": "基础配置", + "link": "/system/basic-config" + }, + { + "text": "协议配置", + "link": "/system/agreement-config" + }, + { + "text": "菜单管理", + "link": "/menu-management/index" + }, + { + "text": "接口权限", + "link": "/menu-management/auth" + }, + { + "text": "系统配置", + "link": "/system/system-config" + }, + { + "text": "货物名称配置", + "link": "/system/goods-name-config" + } + ] + }, + { + "text": "合伙人管理", + "icon": "anticon anticon-dashboard", + "children": [{ + "text": "合伙人列表", + "link": "/partner/partner-list" + }, + { + "text": "业务统计", + "link": "/partner/business-statistics/index" + }, + { + "text": "返佣管理", + "group": true, + "children": [{ + "text": "返佣配置", + "link": "/partner/rebate/setting" + }, + { + "text": "返佣明细", + "link": "/partner/rebate/particulars" + }, + { + "text": "返佣记录", + "link": "/partner/rebate/record" + } + ] + }, + { + "text": "销售渠道管理", + "link": "/partner/channel-sales/list" + }, + { + "text": "等级配置", + "link": "/partner/level-config/list" + }, + { + "text": "账户管理", + "group": true, + "children": [{ + "text": "账户管理", + "link": "/partner/account-management/am/list" + }, + { + "text": "账户明细", + "link": "/partner/account-management/am/detail/:id", + "hide": true + }, + { + "text": "提现记录", + "link": "/partner/account-management/withdraw-record" + }, + { + "text": "提现详情", + "link": "/partner/account-management/withdraw-record/detail/:id", + "hide": true + }, + { + "text": "待入账明细", + "link": "/partner/account-management/am/recorded/detail/:id", + "hide": true + } + ] + }, + { + "text": "客户认领审核", + "link": "/partner/claim-audit/list" + }, + { + "text": "合伙人客户认领详情", + "link": "/partner/claim-audit/partner-detail", + "hide": true + }, + { + "text": "渠道销售客户认领详情", + "link": "/partner/claim-audit/channel-detail", + "hide": true + }, + { + "text": "入账记录", + "link": "/partner/recorded/record" + }, + { + "text": "入账详情", + "link": "/partner/recorded/record/:id", + "hide": true + }, + { + "text": "轮播图管理", + "link": "/partner/scroll-img/list" + }, + { + "text": "建议反馈管理", + "link": "/partner/advice-feedback/list" + }, + { + "text": "建议反馈管理详情", + "link": "/partner/advice-feedback/detail", + "hide": true + }, + { + "text": "知识库管理", + "icon": "iconfont icon-yundan-copy", + "group": true, + "children": [{ + "text": "banner管理", + "link": "/partner/knowledge/banner", + "children": [{ + "text": "新增banner", + "link": "/partner/knowledge/banner/detail" + }] + }, + { + "text": "文章管理", + "link": "/partner/knowledge/article-management-list" + }, + { + "text": "新增文章", + "link": "/partner/knowledge/article-management-add", + "hide": true + }, + { + "text": "编辑文章", + "link": "/partner/knowledge/article-management-edit", + "hide": true + } + ] + } + ] + }, + { + "text": "数据监管", + "icon": "iconfont icon-hetong-copy", + "group": true, + "children": [{ + "text": "数据报表", + "link": "/regulatory-data/dashboard" + }] + } + ] + }] } -} \ No newline at end of file +} From 3aea263ba1b22f5f86ee28dd0b1aed35af600cb0 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Wed, 23 Mar 2022 19:46:34 +0800 Subject: [PATCH 04/99] fix bug --- .../receipts-audit.component.html | 6 +-- .../receipts-audit.component.ts | 31 ++++++++++++++- .../components/risk/risk.component.html | 6 +-- .../components/risk/risk.component.ts | 39 ++++++++++++++----- 4 files changed, 66 insertions(+), 16 deletions(-) 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 706bb060..90e17eac 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 @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-12 10:52:50 * @LastEditors : Shiming - * @LastEditTime : 2022-03-22 17:54:50 + * @LastEditTime : 2022-03-23 19:43:26 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\receipts-audit\\receipts-audit.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -59,8 +59,8 @@ [scroll]="{ x: '2000px' }" [data]="service.$api_get_billExamine_page" [columns]="columns" - [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }" - [res]="{ reName: { list: 'data.records', total: 'data.total' } }" + [req]="{ process: beforeReq }" + [res]="{ reName: { list: 'data.records', total: 'data.total' } , process: afterRes}" [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }" [loading]="false" > 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 1f14ce54..414bb7a0 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 @@ -1,5 +1,5 @@ import { Component, OnInit, ViewChild } from '@angular/core'; -import { STColumn, STComponent } from '@delon/abc/st'; +import { STColumn, STComponent, STRequestOptions } from '@delon/abc/st'; import { SFComponent, SFDateWidgetSchema, SFSchema, SFSchemaEnum, SFSelectWidgetSchema, SFUISchema } from '@delon/form'; import { ModalHelper, _HttpClient } from '@delon/theme'; import { NzModalService } from 'ng-zorro-antd/modal'; @@ -30,6 +30,7 @@ export class OrderManagementReceiptsAuditComponent implements OnInit { @ViewChild('st') private readonly st!: STComponent; @ViewChild('sf', { static: false }) sf!: SFComponent; columns: STColumn[] = []; + loading: boolean = true; resourceStatus: any; tabs = { receivedQuantity: 0, @@ -62,6 +63,34 @@ export class OrderManagementReceiptsAuditComponent implements OnInit { } }; } + beforeReq = (requestOptions: STRequestOptions) => { + const a: any = {}; + if (this.resourceStatus) { + a.auditStatus = this.resourceStatus; + } + const params: any = Object.assign({}, this.sf?.value || {}); + delete params._$expand; + if (this.sf) { + Object.assign(requestOptions.body, { + ...a, + ...params, + createTime: { + start: this.sf?.value?.createTime?.[0] || '', + end: this.sf?.value?.createTime?.[1] || '' + } + }); + } + this.loading = true; + return requestOptions; + }; + afterRes = (data: any[], rawData?: any) => { + console.log(data) + this.loading = false + return data.map(item => ({ + ...item, + // disabled: item.billStatus !== '4' + })); + }; get selectedRows() { return this.st?.list.filter(item => item.checked) || []; } diff --git a/src/app/routes/order-management/components/risk/risk.component.html b/src/app/routes/order-management/components/risk/risk.component.html index 00a56cc6..a08cc584 100644 --- a/src/app/routes/order-management/components/risk/risk.component.html +++ b/src/app/routes/order-management/components/risk/risk.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-12 10:52:50 * @LastEditors : Shiming - * @LastEditTime : 2022-03-22 09:42:03 + * @LastEditTime : 2022-03-23 19:45:45 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\risk\\risk.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -59,8 +59,8 @@ [scroll]="{ x: '2000px' }" [data]="service.$api_get_listRiskPage" [columns]="columns" - [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }" - [res]="{ reName: { list: 'data.records', total: 'data.total' } }" + [req]="{ process: beforeReq }" + [res]="{ reName: { list: 'data.records', total: 'data.total' } , process: afterRes}" [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }" [loading]="false" > diff --git a/src/app/routes/order-management/components/risk/risk.component.ts b/src/app/routes/order-management/components/risk/risk.component.ts index 97339153..20c05ddc 100644 --- a/src/app/routes/order-management/components/risk/risk.component.ts +++ b/src/app/routes/order-management/components/risk/risk.component.ts @@ -1,7 +1,7 @@ import { registerLocaleData } from '@angular/common'; import { Router } from '@angular/router'; import { Component, OnInit, ViewChild } from '@angular/core'; -import { STColumn, STComponent } from '@delon/abc/st'; +import { STColumn, STComponent, STRequestOptions } from '@delon/abc/st'; import { SFComponent, SFDateWidgetSchema, SFSchema, SFSchemaEnum, SFSelectWidgetSchema, SFUISchema } from '@delon/form'; import { ModalHelper, _HttpClient } from '@delon/theme'; import { ShipperBaseService } from '@shared'; @@ -21,6 +21,7 @@ export class OrderManagementRiskComponent implements OnInit { schema: SFSchema = {}; schemaView: SFSchema = {}; auditMany = false; + loading: boolean = true; auditId: any; auditIdR: any; isVisibleRE = false; @@ -47,14 +48,6 @@ export class OrderManagementRiskComponent implements OnInit { * 查询参数 */ get reqParams() { - // const a:any = {}; - // if(this.resourceStatus) { - // a.representationsStatus = this.resourceStatus - // } - // return { - // ...a, - // ...this.sf?.value, - // }; const a: any = {}; if (this.resourceStatus) { a.representationsStatus = this.resourceStatus @@ -70,6 +63,34 @@ export class OrderManagementRiskComponent implements OnInit { }, }; } + beforeReq = (requestOptions: STRequestOptions) => { + const a: any = {}; + if (this.resourceStatus) { + a.representationsStatus = this.resourceStatus + } + const params: any = Object.assign({}, this.sf?.value || {}); + delete params._$expand; + if (this.sf) { + Object.assign(requestOptions.body, { + ...a, + ...params, + createTime: { + start: this.sf?.value?.createTime?.[0] || '', + end: this.sf?.value?.createTime?.[1] || '', + }, + }); + } + this.loading = true; + return requestOptions; + }; + afterRes = (data: any[], rawData?: any) => { + console.log(data) + this.loading = false + return data.map(item => ({ + ...item, + disabled: item.auditStatus !== '1' + })); + }; search() { this.st?.load(1); this.getGoodsSourceStatistical() From 488b4f6dab65bbad8929fe6ff71005a82ec5a3af Mon Sep 17 00:00:00 2001 From: wangshiming Date: Wed, 23 Mar 2022 19:51:40 +0800 Subject: [PATCH 05/99] fix bug --- .../insurance-management/components/list/list.component.ts | 2 +- .../routes/order-management/components/bulk/bulk.component.ts | 2 +- .../components/compliance-audit/compliance-audit.component.ts | 2 +- .../components/receipts-audit/receipts-audit.component.ts | 2 +- .../order-management/components/vehicle/vehicle.component.ts | 2 +- .../supply-management/components/vehicle/vehicle.component.ts | 2 +- .../components/abnormal-appear/abnormal-appear.component.ts | 2 +- .../waybill-management/components/vehicle/vehicle.component.ts | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/app/routes/insurance-management/components/list/list.component.ts b/src/app/routes/insurance-management/components/list/list.component.ts index c2d73dd7..c6fbcbb1 100644 --- a/src/app/routes/insurance-management/components/list/list.component.ts +++ b/src/app/routes/insurance-management/components/list/list.component.ts @@ -233,7 +233,7 @@ export class insuranceManagementListComponent implements OnInit { title: '所属项目', ui: { widget: 'select', - placeholder: '请选择', + placeholder: '请先选择货主', visibleIf: { _$expand: (value: boolean) => value }, diff --git a/src/app/routes/order-management/components/bulk/bulk.component.ts b/src/app/routes/order-management/components/bulk/bulk.component.ts index 6f559e19..b4b9f407 100644 --- a/src/app/routes/order-management/components/bulk/bulk.component.ts +++ b/src/app/routes/order-management/components/bulk/bulk.component.ts @@ -220,7 +220,7 @@ export class OrderManagementBulkComponent implements OnInit { title: '所属项目', ui: { widget: 'select', - placeholder: '请选择', + placeholder: '请先选择货主', visibleIf: { _$expand: (value: boolean) => value }, diff --git a/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.ts b/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.ts index 739ca164..0cee8081 100644 --- a/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.ts +++ b/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.ts @@ -179,7 +179,7 @@ export class OrderManagementComplianceAuditComponent implements OnInit { title: '所属项目', ui: { widget: 'select', - placeholder: '请选择', + placeholder: '请先选择货主', visibleIf: { _$expand: (value: boolean) => value }, 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 414bb7a0..8158747b 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 @@ -183,7 +183,7 @@ export class OrderManagementReceiptsAuditComponent implements OnInit { title: '所属项目', ui: { widget: 'select', - placeholder: '请选择', + placeholder: '请先选择货主', visibleIf: { _$expand: (value: boolean) => value }, 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 949afb99..33879e09 100644 --- a/src/app/routes/order-management/components/vehicle/vehicle.component.ts +++ b/src/app/routes/order-management/components/vehicle/vehicle.component.ts @@ -237,7 +237,7 @@ export class OrderManagementVehicleComponent extends BasicTableComponent impleme title: '所属项目', ui: { widget: 'select', - placeholder: '请选择' + placeholder: '请先选择货主', } as SFSelectWidgetSchema }, loadingPlace: { diff --git a/src/app/routes/supply-management/components/vehicle/vehicle.component.ts b/src/app/routes/supply-management/components/vehicle/vehicle.component.ts index 1b9be03d..7b9fd221 100644 --- a/src/app/routes/supply-management/components/vehicle/vehicle.component.ts +++ b/src/app/routes/supply-management/components/vehicle/vehicle.component.ts @@ -425,7 +425,7 @@ export class SupplyManagementVehicleComponent implements OnInit { title: '所属项目', ui: { widget: 'select', - placeholder: '请选择', + placeholder: '请先选择货主', visibleIf: { _$expand: (value: boolean) => value } diff --git a/src/app/routes/waybill-management/components/abnormal-appear/abnormal-appear.component.ts b/src/app/routes/waybill-management/components/abnormal-appear/abnormal-appear.component.ts index 425de6a2..083e427b 100644 --- a/src/app/routes/waybill-management/components/abnormal-appear/abnormal-appear.component.ts +++ b/src/app/routes/waybill-management/components/abnormal-appear/abnormal-appear.component.ts @@ -152,7 +152,7 @@ export class WaybillManagementAbnormalAppearComponent implements OnInit { title: '所属项目', ui: { widget: 'select', - placeholder: '请选择', + placeholder: '请先选择货主', visibleIf: { _$expand: (value: boolean) => value } diff --git a/src/app/routes/waybill-management/components/vehicle/vehicle.component.ts b/src/app/routes/waybill-management/components/vehicle/vehicle.component.ts index fae79518..7e69667e 100644 --- a/src/app/routes/waybill-management/components/vehicle/vehicle.component.ts +++ b/src/app/routes/waybill-management/components/vehicle/vehicle.component.ts @@ -116,7 +116,7 @@ export class WaybillManagementVehicleComponent implements OnInit { title: '所属项目', ui: { widget: 'select', - placeholder: '请选择', + placeholder: '请先选择货主', visibleIf: { _$expand: (value: boolean) => value }, From 3fcafcbbc4783bef67e680134f3568af12c3d3b2 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Wed, 23 Mar 2022 19:57:38 +0800 Subject: [PATCH 06/99] fix bug --- .../tran-agreement.component.ts | 201 ++++++++++-------- 1 file changed, 113 insertions(+), 88 deletions(-) diff --git a/src/app/routes/supply-management/components/tran-agreement/tran-agreement.component.ts b/src/app/routes/supply-management/components/tran-agreement/tran-agreement.component.ts index 0ac169c4..a70664c4 100644 --- a/src/app/routes/supply-management/components/tran-agreement/tran-agreement.component.ts +++ b/src/app/routes/supply-management/components/tran-agreement/tran-agreement.component.ts @@ -1,15 +1,15 @@ /* - * @Description : + * @Description : * @Version : 1.0 * @Author : Shiming * @Date : 2022-02-24 20:19:51 * @LastEditors : Shiming - * @LastEditTime : 2022-03-10 10:27:21 + * @LastEditTime : 2022-03-23 19:57:34 * @FilePath : \\tms-obc-web\\src\\app\\routes\\supply-management\\components\\tran-agreement\\tran-agreement.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ /* - * @Description : + * @Description : * @Version : 1.0 * @Author : Shiming * @Date : 2022-01-06 15:01:40 @@ -28,111 +28,136 @@ import { SupplyManagementService } from '../../services/supply-management.servic styleUrls: ['./tran-agreement.component.less'] }) export class TranAgreementComponent { - enterpriseInfo:any; // 网络货运人 - type:any; + enterpriseInfo: any; // 网络货运人 + type: any; object: any; - agreement:any; - envCache:any; - shipperName:any; - constructor(private modal: NzModalRef,public service: SupplyManagementService,) { - - } + agreement: any; + envCache: any; + shipperName: any; + constructor(private modal: NzModalRef, public service: SupplyManagementService) {} ngOnInit() { - console.log(this.object) - // 获取托运人承运人信息 - this.service.request(this.service.$api_getContractAtr,{id:this.object?.shipperAppUserId}).subscribe(res => { - if (res) { - this.enterpriseInfo = res - this.getContent(); - } - }); - - + console.log(this.object); + // 获取托运人承运人信息 + this.service.request(this.service.$api_getContractAtr, { id: this.object?.shipperAppUserId }).subscribe(res => { + if (res) { + this.enterpriseInfo = res; + this.getContent(); + } + }); } getContent() { - let params:any; - if(this.type ==='onecar'){ - - params = { - contractType:'1', - resourceType: '1', - signingObject: '1', - templateType: 'MX', - parametersDTO: { - contractCode:'', - shipperLegalPersonName:this.enterpriseInfo.legalPersonName || '', //托运法定代表人 - carrierLegalPersonName:this.enterpriseInfo.netLegalPersonName || '', //承运法定代表人 - shipperName:this?.shipperName || '', //托运人 - carrierName:this.object?.enterpriseInfoName || '', //承运人 - consignorInfo: `${this.object?.unLoadingPlaceDTOList[0]?.appUserName || ''} ${this.object?.unLoadingPlaceDTOList[0]?.contractTelephone || ''}`, // 发货信息 - consignorAddress: this.object?.unLoadingPlaceDTOList[0].detailedAddress || '', // 发货地址 - consignorDate: this.object?.loadingTime || '', // 发货时间 - consigneeInfo: `${this.object?.unLoadingPlaceDTOList[this.object?.unLoadingPlaceDTOList.length-1].appUserName} ${this.object?.unLoadingPlaceDTOList[this.object?.unLoadingPlaceDTOList.length-1].contractTelephone}`, // 收货信息 - consigneeDate: this.object?.unloadingTime || '', // 收货时间 - consigneeAddress: this.object?.unLoadingPlaceDTOList[this.object?.unLoadingPlaceDTOList.length-1].detailedAddress || '', // 收货地址 - goodsName:this.object?.goodsInfoDTOList[0].goodsName || '', // 货物名称 - shippingType:'整车运输', - consignmentVolume:`${this.object?.goodsInfoDTOList[0]?.weight || '-'}吨/${this.object?.goodsInfoDTOList[0]?.volume || '-'}方/${this.object?.goodsInfoDTOList[0]?.number || '-'}件`, //托运量 - transporterInfo:'', //运输方信息 - freightAmount:this.object?.total || '', // 订单运费金额（元) - pre:this.object?.expenseDTOList?.filter((item:any) => item.expenseCode === 'PRE')[0].price || '', //预付 - rece:this.object?.expenseDTOList?.filter((item:any) => item.expenseCode === 'RECE')[0].price || '',// 到付 - back:this.object?.expenseDTOList?.filter((item:any) => item.expenseCode === 'BACK')[0].price || '', // 回单付 - lunarKnot:0, - total:this.object?.subtotal || '', // 合计（元) - paymentTime:`到货后${this.object?.paymentDays || ''}天`, // 承诺支付运费时间 - year:new Date().getFullYear() || '', // 签约年份 - month:new Date().getMonth()+1 || '', // 签约月份 - day:new Date().getDate() || '', // 签约日期 - } - } - } else if(this.type ==='bulk'){ + let params: any; + if (this.type === 'onecar') { params = { - contractType:'1', + contractType: '1', + resourceType: '1', + signingObject: '1', + templateType: 'MX', + parametersDTO: { + contractCode: '', + shipperLegalPersonName: this.enterpriseInfo.legalPersonName || '', //托运法定代表人 + carrierLegalPersonName: this.enterpriseInfo.netLegalPersonName || '', //承运法定代表人 + shipperName: this?.shipperName || '', //托运人 + carrierName: this.object?.enterpriseInfoName || '', //承运人 + consignorInfo: `${this.object?.unLoadingPlaceDTOList[0]?.appUserName || ''} ${ + this.object?.unLoadingPlaceDTOList[0]?.contractTelephone || '' + }`, // 发货信息 + consignorAddress: this.object?.unLoadingPlaceDTOList[0].detailedAddress || '', // 发货地址 + consignorDate: this.object?.loadingTime || '', // 发货时间 + consigneeInfo: `${this.object?.unLoadingPlaceDTOList[this.object?.unLoadingPlaceDTOList.length - 1].appUserName} ${ + this.object?.unLoadingPlaceDTOList[this.object?.unLoadingPlaceDTOList.length - 1].contractTelephone + }`, // 收货信息 + consigneeDate: this.object?.unloadingTime || '', // 收货时间 + consigneeAddress: this.object?.unLoadingPlaceDTOList[this.object?.unLoadingPlaceDTOList.length - 1].detailedAddress || '', // 收货地址 + goodsName: this.object?.goodsInfoDTOList[0].goodsName || '', // 货物名称 + shippingType: '整车运输', + consignmentVolume: `${this.object?.goodsInfoDTOList[0]?.weight || '-'}吨/${this.object?.goodsInfoDTOList[0]?.volume || '-'}方/${ + this.object?.goodsInfoDTOList[0]?.number || '-' + }件`, //托运量 + transporterInfo: '', //运输方信息 + freightAmount: this.object?.total || '', // 订单运费金额（元) + pre: this.object?.expenseDTOList?.filter((item: any) => item.expenseCode === 'PRE')[0].price || '', //预付 + rece: this.object?.expenseDTOList?.filter((item: any) => item.expenseCode === 'RECE')[0].price || '', // 到付 + back: this.object?.expenseDTOList?.filter((item: any) => item.expenseCode === 'BACK')[0].price || '', // 回单付 + lunarKnot: 0, + total: this.object?.subtotal || '', // 合计（元) + paymentTime: `到货后${this.object?.paymentDays || ''}天`, // 承诺支付运费时间 + year: new Date().getFullYear() || '', // 签约年份 + month: new Date().getMonth() + 1 || '', // 签约月份 + day: new Date().getDate() || '' // 签约日期 + } + }; + } else if (this.type === 'bulk') { + params = { + contractType: '1', resourceType: '2', signingObject: '1', templateType: 'MX', parametersDTO: { - contractCode:'', - shipperName:this?.shipperName || '', //托运人 - carrierName:this.object?.enterpriseInfoName || '', //承运人 - shipperLegalPersonName:this.enterpriseInfo.legalPersonName || '', //托运法定代表人 - carrierLegalPersonName:this.enterpriseInfo.netLegalPersonName || '', //承运法定代表人 - consignorInfo: `${this.object.unLoadingPlaceDTOList[0]?.appUserName || ''} ${this.object.unLoadingPlaceDTOList[0]?.contractTelephone || ''}`, // 发货信息 + contractCode: '', + shipperName: this?.shipperName || '', //托运人 + carrierName: this.object?.enterpriseInfoName || '', //承运人 + shipperLegalPersonName: this.enterpriseInfo.legalPersonName || '', //托运法定代表人 + carrierLegalPersonName: this.enterpriseInfo.netLegalPersonName || '', //承运法定代表人 + consignorInfo: `${this.object.unLoadingPlaceDTOList[0]?.appUserName || ''} ${ + this.object.unLoadingPlaceDTOList[0]?.contractTelephone || '' + }`, // 发货信息 consignorAddress: this.object.unLoadingPlaceDTOList[0].detailedAddress, // 发货地址 consignorDate: '', // 发货时间 - consigneeInfo: `${this.object.unLoadingPlaceDTOList[this.object.unLoadingPlaceDTOList.length-1]?.appUserName || ''} ${this.object.unLoadingPlaceDTOList[this.object.unLoadingPlaceDTOList.length-1]?.contractTelephone || ''}`, // 收货信息 + consigneeInfo: `${this.object.unLoadingPlaceDTOList[this.object.unLoadingPlaceDTOList.length - 1]?.appUserName || ''} ${ + this.object.unLoadingPlaceDTOList[this.object.unLoadingPlaceDTOList.length - 1]?.contractTelephone || '' + }`, // 收货信息 consigneeDate: '', // 收货时间 - consigneeAddress: this.object.unLoadingPlaceDTOList[this.object.unLoadingPlaceDTOList.length-1]?.detailedAddress || '', // 收货地址 - goodsName:this.object.goodsInfoDTOList[0]?.goodsName || '', // 货物名称 - shippingType:'大宗运输', - consignmentVolume:`${this.object?.goodsInfoDTOList?.[0]?.weight|| '-'}吨/${this.object?.goodsInfoDTOList?.[0]?.volume || '-'}方/${this.object.goodsInfoDTOList?.[0]?.number || '-'}车`, //托运量 - transporterInfo:'', //运输方信息 - freightAmount:'', // 订单运费金额（元) - pre:'', //预付 - rece:'',// 到付 - back:'',// 回单付 - lunarKnot:'', - total:'', // 合计（元) - paymentTime:`到货后${this.object?.paymentDays || ''}天`, // 承诺支付运费时间 - year:new Date().getFullYear() || '', // 签约年份 - month:new Date().getMonth()+1 || '', // 签约月份 - day:new Date().getDate() || '', // 签约日期 - }, - } + consigneeAddress: this.object.unLoadingPlaceDTOList[this.object.unLoadingPlaceDTOList.length - 1]?.detailedAddress || '', // 收货地址 + goodsName: this.object.goodsInfoDTOList[0]?.goodsName || '', // 货物名称 + shippingType: '大宗运输', + consignmentVolume: `${this.object?.goodsInfoDTOList?.[0]?.weight || '-'}吨/${ + this.object?.goodsInfoDTOList?.[0]?.volume || '-' + }方/${this.object.goodsInfoDTOList?.[0]?.number || '-'}车`, //托运量 + transporterInfo: '', //运输方信息 + freightAmount: '', // 订单运费金额（元) + pre: '', //预付 + rece: '', // 到付 + back: '', // 回单付 + lunarKnot: '', + total: '', // 合计（元) + paymentTime: `到货后${this.object?.paymentDays || ''}天`, // 承诺支付运费时间 + year: new Date().getFullYear() || '', // 签约年份 + month: new Date().getMonth() + 1 || '', // 签约月份 + day: new Date().getDate() || '' // 签约日期 + } + }; } - console.log(params) - this.service.request(this.service.$api_getContractContent,params).subscribe((res) => { + if (params.parametersDTO.freightAmount) { + params.parametersDTO.freightAmount = this.toThousands(params.parametersDTO.freightAmount); + } + if (params.parametersDTO.pre) { + params.parametersDTO.pre = this.toThousands(params.parametersDTO.pre); + } + if (params.parametersDTO.rece) { + params.parametersDTO.rece = this.toThousands(params.parametersDTO.rece); + } + if (params.parametersDTO.back) { + params.parametersDTO.back = this.toThousands(params.parametersDTO.back); + } + if (params.parametersDTO.total) { + params.parametersDTO.total = this.toThousands(params.parametersDTO.total); + } + console.log(params); + this.service.request(this.service.$api_getContractContent, params).subscribe(res => { if (res) { this.agreement = res.contractContent; } }); } - handleOk(){ + + toThousands(num: any) { + let str = num.toString(); + return '￥' + str.replace(/(\d)(?=(?:\d{3})+$)/g, '$1,'); + } + handleOk() { this.modal.close(true); } - - } From 859ebe036d592b80167ad3b1ee41f56ac113de9c Mon Sep 17 00:00:00 2001 From: wangshiming Date: Wed, 23 Mar 2022 20:02:52 +0800 Subject: [PATCH 07/99] fix bug --- .../complaint/complaint.component.ts | 22 +++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/src/app/routes/order-management/components/complaint/complaint.component.ts b/src/app/routes/order-management/components/complaint/complaint.component.ts index eb081b50..e308c49c 100644 --- a/src/app/routes/order-management/components/complaint/complaint.component.ts +++ b/src/app/routes/order-management/components/complaint/complaint.component.ts @@ -103,6 +103,18 @@ export class OrderManagementComplaintComponent implements OnInit { type: 'string', title: '投诉单号', }, + complaintCause: { + title: '投诉原因', + type: 'string', + ui: { + widget: 'dict-select', + params: { dictKey: 'complaint:cause' }, + containsAllLabel: true, + visibleIf: { + _$expand: (value: boolean) => value + } + } as SFSelectWidgetSchema + }, complainantTime: { title: '投诉时间', type: 'string', @@ -124,14 +136,14 @@ export class OrderManagementComplaintComponent implements OnInit { this.columns = [ { title: '投诉单号', - width: '170px', + width: '200px', fixed: 'left', className: 'text-center', render: 'complaintCode' }, { title: '运单号', - width: '170px', + width: '200px', className: 'text-center', index: 'wayBillCode' }, @@ -161,6 +173,12 @@ export class OrderManagementComplaintComponent implements OnInit { width: '200px', index:'handlePartyLabel' }, + { + title: '处理时间', + className: 'text-center', + width: '200px', + index:'handleTime' + }, { title: '处理结果', className: 'text-center', From b21c7dd8d562c47c339fb5e5f87276b36e6e74ff Mon Sep 17 00:00:00 2001 From: wangshiming Date: Wed, 23 Mar 2022 20:28:10 +0800 Subject: [PATCH 08/99] fix bug --- .../components/receipts-audit/receipts-audit.component.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 90e17eac..79cfc254 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 @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-12 10:52:50 * @LastEditors : Shiming - * @LastEditTime : 2022-03-23 19:43:26 + * @LastEditTime : 2022-03-23 20:27:34 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\receipts-audit\\receipts-audit.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -103,7 +103,7 @@ {{item?.billStatusLabel}}
- {{item?.billTypeLabel}}{{item?.serviceTypeLabel}} + {{item?.resourceTypeLabel}}{{item?.serviceTypeLabel}}
From 57cab8a928152330fab69c82ecd2c98dc73ce2f6 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Wed, 23 Mar 2022 20:36:47 +0800 Subject: [PATCH 09/99] fix bug --- .../components/receipts-audit/receipts-audit.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 79cfc254..130bfeff 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 @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-12 10:52:50 * @LastEditors : Shiming - * @LastEditTime : 2022-03-23 20:27:34 + * @LastEditTime : 2022-03-23 20:36:40 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\receipts-audit\\receipts-audit.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> From 9092299b3dbb536302a94df81a78d53e43362337 Mon Sep 17 00:00:00 2001 From: Lingzi Date: Wed, 23 Mar 2022 20:54:03 +0800 Subject: [PATCH 10/99] fix bug --- .../freight/list/detail/detail.component.html | 49 +++++++-- .../freight/list/detail/detail.component.less | 12 ++ .../freight/list/detail/detail.component.ts | 103 ++++++++++++++++-- .../usercenter/services/usercenter.service.ts | 6 + 4 files changed, 152 insertions(+), 18 deletions(-) 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 759eb4d3..9e474055 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 @@ -269,8 +269,8 @@ - + 合伙人信息 - + + + - - - @@ -378,20 +382,45 @@ 渠道销售信息 - - - - + + + + + + {{ item.remark }} + -- + + + + + + + {{ item.remark }} + -- + + + + +
diff --git a/src/app/routes/usercenter/components/freight/list/detail/detail.component.less b/src/app/routes/usercenter/components/freight/list/detail/detail.component.less index 21bf7187..6231c9e2 100644 --- a/src/app/routes/usercenter/components/freight/list/detail/detail.component.less +++ b/src/app/routes/usercenter/components/freight/list/detail/detail.component.less @@ -43,4 +43,16 @@ left: 106px; } } + .overflowText { + display: -webkit-box; + max-width: 155px; + height: 40px; + overflow: hidden; + text-align: left; + text-overflow: -o-ellipsis-lastline; + text-overflow: ellipsis; + -webkit-line-clamp: 2; + line-clamp: 2; + -webkit-box-orient: vertical; + } } diff --git a/src/app/routes/usercenter/components/freight/list/detail/detail.component.ts b/src/app/routes/usercenter/components/freight/list/detail/detail.component.ts index da954bab..bbdf2dc3 100644 --- a/src/app/routes/usercenter/components/freight/list/detail/detail.component.ts +++ b/src/app/routes/usercenter/components/freight/list/detail/detail.component.ts @@ -1,6 +1,7 @@ import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; import { apiConf } from '@conf/api.conf'; +import { STColumn, STComponent } from '@delon/abc/st'; import { DatePipe, _HttpClient } from '@delon/theme'; import { NzModalService } from 'ng-zorro-antd/modal'; import { fromEvent, Subscription } from 'rxjs'; @@ -13,11 +14,14 @@ import { UsermanageService } from '../../../../services/usercenter.service'; providers: [DatePipe] }) export class FreightComponentsListDetailComponent implements OnInit, OnDestroy { + @ViewChild('st') private readonly st!: STComponent; + @ViewChild('st1') private readonly st1!: STComponent; @ViewChild('approvedModal', { static: false }) approvedModal!: any; @ViewChild('redectModal', { static: false }) redectModal!: any; - + columns: STColumn[] = []; + recordColumns!: STColumn[]; detailData: any = { adminUserInfo: { name: '' }, legalPersonIdentityVO: { name: '' } }; tempalateData = { ...this.detailData }; suppliersData: any = {}; @@ -35,7 +39,7 @@ export class FreightComponentsListDetailComponent implements OnInit, OnDestroy { networkTransporter = null; roleId = null; customerServiceId = null; - + partnerInfo: any = {}; esignCheckStatus: any = { 0: '不通过', 1: '通过', @@ -43,16 +47,31 @@ export class FreightComponentsListDetailComponent implements OnInit, OnDestroy { }; billEvaluate = null; - scrollTop = 0; subscribeScoll!: Subscription; + /** + * 查询参数 + */ + get reqParamsCar() { + const params = { + id: this.route.snapshot.params.id, + bindType: 0 + } + return { ...params }; + } + get reqParams() { + const params = { + id: this.route.snapshot.params.id, + } + return { ...params }; + } constructor( public service: UsermanageService, private route: ActivatedRoute, private nzModalService: NzModalService, private router: Router, private datePipe: DatePipe - ) {} + ) { } ngOnDestroy(): void { this.subscribeScoll.unsubscribe(); } @@ -62,12 +81,80 @@ export class FreightComponentsListDetailComponent implements OnInit, OnDestroy { this.initData(); this.loadltdId(); this.loadRoles(); + this.initST(); + this.initRecordST() this.loadCustomerServices(); + this.loadPartnerInfo() }); this.subscribeScoll = fromEvent(window, 'scroll').subscribe(event => { this.scrollTop = document.documentElement.scrollTop; }); } + /** +* 初始化数据列表 +*/ + initST() { + this.columns = [ + { title: '修改后合伙人', index: 'newPartnerName', className: 'text-center' }, + { title: '修改前合伙人', index: 'originalPartnerNamel', className: 'text-center' }, + { title: '备注', render: 'remark', className: 'text-center' }, + { title: '结算起算日', index: 'settStartTime', className: 'text-center' }, + { title: '生效节点', index: 'effectiveNode', className: 'text-center', type: 'enum', enum: { + 1: '立即生效', + 2: 'CRM审核后生效', + 3: '审核通过生效', + } }, + { + title: 'CRM审核状态', index: 'effectiveStatus', + type: 'enum', + enum: { + 0: '已失效', + 1: '未生效', + 2: '已生效', + }, + className: 'text-center' + }, + { title: '修改时间', render: 'modifyTime', className: 'text-center' }, + { title: '生效时间', render: 'effectiveTime', className: 'text-center' }, + { title: '操作人', render: 'approvalUser', className: 'text-center' }, + + ]; + } + /** + * 初始化数据列表 + */ + initRecordST() { + this.recordColumns = [ + { title: '修改后渠道销售', index: 'newChannelName', className: 'text-center' }, + { title: '修改前渠道销售地', index: 'originalChannelName', className: 'text-center' }, + { title: '备注', render: 'remark', className: 'text-center' }, + { title: '生效节点', index: 'effectiveNode', className: 'text-center', type: 'enum', enum: { + 1: '立即生效', + 2: 'CRM审核后生效', + 3: '审核通过生效', + } }, + { + title: 'CRM审核状态', index: 'effectiveStatus', + type: 'enum', + enum: { + 0: '已失效', + 1: '未生效', + 2: '已生效', + }, + className: 'text-center' + }, + { title: '修改时间', render: 'mybidDetailInfo', className: 'text-center' }, + { title: '生效时间', index: 'eeffectiveTime', className: 'text-center' }, + { title: '操作人', index: 'approvalUser', className: 'text-center' } + ]; + } + loadPartnerInfo(){ + this.service.request(this.service.$api_getEnterpriceRel, {id: this.route.snapshot.params.id}).subscribe(res => { + if (res) { + this.partnerInfo = res; + } + }); + } loadltdId() { this.service.getNetworkFreightForwarder().subscribe(res => { if (res) { @@ -273,7 +360,7 @@ export class FreightComponentsListDetailComponent implements OnInit, OnDestroy { res => { node.children = res.map((item: any) => ({ ...item, isLeaf: index === 1, value: item.regionCode, label: item.name })); }, - _ => {}, + _ => { }, () => { resolve(node); } @@ -286,17 +373,17 @@ export class FreightComponentsListDetailComponent implements OnInit, OnDestroy { this.isEdit = false; } - save(data: any){ + save(data: any) { const dateil = { ...this.detailData }; Object.assign(dateil.legalPersonIdentityVO, { validStartTime: this.datePipe.transform(dateil.legalPersonIdentityVO.validStartTime, 'yyyy-MM-dd'), validEndTime: this.datePipe.transform(dateil.legalPersonIdentityVO.validEndTime, 'yyyy-MM-dd') }); - if (!this.detailData?.enterpriseName || !this.detailData?.enterpriseAddress) { + if (!this.detailData?.enterpriseName || !this.detailData?.enterpriseAddress) { this.service.msgSrv.error('请完善企业基本信息！') return false; } - if (!this.detailData.legalPersonIdentityVO.name || !this.detailData.legalPersonIdentityVO.certificateNumber) { + if (!this.detailData.legalPersonIdentityVO.name || !this.detailData.legalPersonIdentityVO.certificateNumber) { this.service.msgSrv.error('请完善法人信息！') return false; } diff --git a/src/app/routes/usercenter/services/usercenter.service.ts b/src/app/routes/usercenter/services/usercenter.service.ts index 169752b5..07792f92 100644 --- a/src/app/routes/usercenter/services/usercenter.service.ts +++ b/src/app/routes/usercenter/services/usercenter.service.ts @@ -154,6 +154,12 @@ export class UsermanageService extends ShipperBaseService { $api_batchUpdateEnterpricePartner = '/api/mdc/enterpriceRelLog/batchUpdateEnterpricePartner'; // 渠道销售修改详情 $api_partnerChannelUpdateDetaiList = '/api/mdc/enterpriceRelLog/partnerChannelUpdateDetaiList'; + // 查询企业修改合伙人记录 + $api_findEnterpricePartnerRelLog = '/api/mdc/enterpriceRelLog/findEnterpricePartnerRelLog'; + // 查询企业修改渠道记录 + $api_findEnterpriceChannelRelLog = '/api/mdc/enterpriceRelLog/findEnterpriceChannelRelLog'; + // 查询企业合伙人渠道关系信息 + $api_getEnterpriceRel = '/api/mdc/enterpriceRelLog/getEnterpriceRel'; constructor(public injector: Injector, public nzModalService: NzModalService, private nzImageService: NzImageService) { super(injector); From f38a165c67a6002dc2eb5e2deb8bd5a2bccd002c Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Thu, 24 Mar 2022 09:04:07 +0800 Subject: [PATCH 11/99] edit --- .../shared/services/business/user.service.ts | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/app/shared/services/business/user.service.ts b/src/app/shared/services/business/user.service.ts index 7cd940c5..82f6a790 100644 --- a/src/app/shared/services/business/user.service.ts +++ b/src/app/shared/services/business/user.service.ts @@ -152,16 +152,16 @@ export class EAUserService extends BaseService { * 加载用户菜单 */ async loadUserMenus() { - // return this.asyncRequest(this.$api_get_user_menus, { - // appId: this.envSrv.getEnvironment().appId - // }).then(res => { - // this.cacheSrv.set(cacheConf.menu, res); - // this.menuService.add(res); - // }); - this.request('assets/mocks/menu-data.json', {}, 'GET').subscribe((res: any) => { - this.cacheSrv.set(cacheConf.menu, res.menu); - this.menuService.add(res.menu); + return this.asyncRequest(this.$api_get_user_menus, { + appId: this.envSrv.getEnvironment().appId + }).then(res => { + this.cacheSrv.set(cacheConf.menu, res); + this.menuService.add(res); }); + // this.request('assets/mocks/menu-data.json', {}, 'GET').subscribe((res: any) => { + // this.cacheSrv.set(cacheConf.menu, res.menu); + // this.menuService.add(res.menu); + // }); } /** From 559ba3955c3b90cc05910bc669925990df1f56e9 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Thu, 24 Mar 2022 09:08:53 +0800 Subject: [PATCH 12/99] edit --- .../transaction-flow/transaction-flow.component.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/app/routes/financial-management/components/transaction-flow/transaction-flow.component.ts b/src/app/routes/financial-management/components/transaction-flow/transaction-flow.component.ts index 46af35d3..92cb10f7 100644 --- a/src/app/routes/financial-management/components/transaction-flow/transaction-flow.component.ts +++ b/src/app/routes/financial-management/components/transaction-flow/transaction-flow.component.ts @@ -35,7 +35,7 @@ export class TransactionFlowComponent { Object.assign(requestOptions.body, { ...this.sf.value, createTime: { - start: this.sf.value.tcreateTimeime?.[0] || '', + start: this.sf.value.createTime?.[0] || '', end: this.sf.value.createTime?.[1] || '' } }); @@ -120,9 +120,9 @@ export class TransactionFlowComponent { type: 'string', title: '收支类型', enum: [ - { label: '全部', value: '部' }, - { label: '收入', value: 1 }, - { label: '支出', value: 2 } + { label: '全部', value: '' }, + { label: '收入', value: 2 }, + { label: '支出', value: 1 } ], ui: { widget: 'select', From 5c317813ec8bed1713cdba57c6a2ed6e68d1df25 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Thu, 24 Mar 2022 09:28:48 +0800 Subject: [PATCH 13/99] edit --- .../components/payment-order/payment-order.component.ts | 2 ++ .../components/receipt-order/receipt-order.component.ts | 2 ++ .../components/receivable-order/receivable-order.component.ts | 1 + 3 files changed, 5 insertions(+) diff --git a/src/app/routes/financial-management/components/payment-order/payment-order.component.ts b/src/app/routes/financial-management/components/payment-order/payment-order.component.ts index 7287c7bb..646321c1 100644 --- a/src/app/routes/financial-management/components/payment-order/payment-order.component.ts +++ b/src/app/routes/financial-management/components/payment-order/payment-order.component.ts @@ -235,6 +235,8 @@ export class PaymentOrderComponent implements OnInit { { title: '', index: 'key', type: 'checkbox', fixed: 'left', className: 'text-center' }, { title: '付款单号', index: 'payCode', type: 'link', width: 180 }, { title: '网络货运人', index: 'ltdName', width: 180 }, + { title: '运单号', index: 'waybillCode', width: 180 }, + { title: '费用号', index: 'feeCode', width: 180 }, { title: '要求付款日期', index: 'payDate', type: 'date', className: 'text-center', width: 150 }, { title: '付款金额', 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 79ad4c5d..bda876c4 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 @@ -231,6 +231,8 @@ export class ReceiptOrderComponent implements OnInit { return [ { title: '', index: 'key', type: 'checkbox', width: 60, fixed: 'left', className: 'text-center' }, { title: '收款单号', index: 'brmcode', type: 'link', width: 180, className: 'text-left' }, + { title: '订单号', index: 'billHCode', width: 180, className: 'text-left' }, + { title: '费用号', index: 'feeCode', width: 180, className: 'text-left' }, { title: '网络货运人', index: 'ltdName', width: 200, className: 'text-left' }, { title: '到账日期', index: 'brmdate', type: 'date', width: 200, className: 'text-left' }, { title: '收款账户', index: 'ltdaccountId', width: 200, className: 'text-left' }, 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 26e11de5..809ec0e7 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 @@ -242,6 +242,7 @@ export class ReceivableOrderComponent implements OnInit { return [ { title: '', index: 'key', type: 'checkbox' }, { title: '核销单号', index: 'ahxcode', type: 'link', width: 140 }, + { title: '订单号', index: 'billHCode', type: 'link', width: 140 }, { title: '网络货运人', index: 'ltdName', width: 160 }, { title: '核销日期', index: 'ahxdate', type: 'date', width: 160 }, { title: '付款账户', index: 'shipperaccount', width: 170 }, From f98e57c3aa2f4008e2130a0ab4993307b255370c Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 24 Mar 2022 09:31:05 +0800 Subject: [PATCH 14/99] fix bug --- .../components/receipts-audit/receipts-audit.component.html | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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 130bfeff..ff01551d 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 @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-12 10:52:50 * @LastEditors : Shiming - * @LastEditTime : 2022-03-23 20:36:40 + * @LastEditTime : 2022-03-24 09:30:32 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\receipts-audit\\receipts-audit.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -98,7 +98,9 @@
{{ item?.payeeName }}/{{ item?.payeePhone }}
-
{{ item.billCode }}
+ + {{ item.billCode }} + {{ item.billCode }}
{{item?.billStatusLabel}}
From 6791d345c3912910dac40c8819c700832ef8374d Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 24 Mar 2022 09:37:18 +0800 Subject: [PATCH 15/99] fix bug --- .../compliance-audit/compliance-audit.component.html | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.html b/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.html index 55175204..7b40d163 100644 --- a/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.html +++ b/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-12 10:52:50 * @LastEditors : Shiming - * @LastEditTime : 2022-03-23 13:34:31 + * @LastEditTime : 2022-03-24 09:34:56 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\compliance-audit\\compliance-audit.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -87,13 +87,14 @@
{{ item?.payeeName }}/{{ item?.payeePhone }}
-
{{ item.billCode }}
-
- {{ item?.resourceTypeLabel }}{{ item?.serviceTypeLabel }} -
+ {{ item.billCode }} + {{ item.billCode }}
{{ item?.billStatusLabel }}
+
+ {{item?.resourceTypeLabel}}{{item?.serviceTypeLabel}} +
{{ item?.goodsName }}
From 786010bb597818851a1f41927a07862dbb870ba2 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 24 Mar 2022 09:40:58 +0800 Subject: [PATCH 16/99] fix bug --- .../components/risk/risk.component.html | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/app/routes/order-management/components/risk/risk.component.html b/src/app/routes/order-management/components/risk/risk.component.html index a08cc584..e1127fe4 100644 --- a/src/app/routes/order-management/components/risk/risk.component.html +++ b/src/app/routes/order-management/components/risk/risk.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-12 10:52:50 * @LastEditors : Shiming - * @LastEditTime : 2022-03-23 19:45:45 + * @LastEditTime : 2022-03-24 09:39:49 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\risk\\risk.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -65,7 +65,14 @@ [loading]="false" > - {{ item?.billCode }} + {{ item.billCode }} + {{ item.billCode }} +
+ {{ item?.representationsStatusLabel }} +
+
+ {{item?.billTypeLabel}}{{item?.serviceTypeLabel}} +

创建时间：{{ item?.createTime }}

From 5607c2b820cc8e69ff314ef5f30a93adbffd28d4 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 24 Mar 2022 09:47:34 +0800 Subject: [PATCH 17/99] fix bug --- .../components/compliance-audit/compliance-audit.component.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.ts b/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.ts index 0cee8081..3ea3d747 100644 --- a/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.ts +++ b/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.ts @@ -331,6 +331,7 @@ export class OrderManagementComplianceAuditComponent implements OnInit { { title: '所属项目', index: 'enterpriseProjectName', width: '220px', className: 'text-left' }, { title: '关联运单号', index: 'wayBillCode', width: '220px', className: 'text-left' }, { title: '货源编号', index: 'resourceCode', width: '180px', className: 'text-left' }, + { title: '服务类型', index: 'serviceTypeLabel', width: '180px', className: 'text-left' }, { title: '装货地', index: 'loadingAddressArr', width: '180px', className: 'text-left' }, { title: '卸货地', From 7d48cde4717275b153788085593e165bbce0d22e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=98=E6=99=93=E4=BA=91?= Date: Thu, 24 Mar 2022 09:48:47 +0800 Subject: [PATCH 18/99] - --- src/styles/theme.less | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/styles/theme.less b/src/styles/theme.less index b39a9b01..ae6c6f8c 100644 --- a/src/styles/theme.less +++ b/src/styles/theme.less @@ -10,12 +10,12 @@ // ==========Custom brand visual color========== .error-color { - color: #ff4d4f; + color: #ff4d4f; } @primary-color : #F5222D; @font-size-base: 15px; -.page-header__title { - display: none; -} \ No newline at end of file +// .page-header__title { +// display: none; +// } From 8378b547dfd087c569a2ad946445da3922b55cbf Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 24 Mar 2022 09:49:17 +0800 Subject: [PATCH 19/99] fix bug --- .../compliance-audit/compliance-audit.component.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.html b/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.html index 7b40d163..34bd3f40 100644 --- a/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.html +++ b/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-12 10:52:50 * @LastEditors : Shiming - * @LastEditTime : 2022-03-24 09:34:56 + * @LastEditTime : 2022-03-24 09:48:40 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\compliance-audit\\compliance-audit.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -87,13 +87,13 @@
{{ item?.payeeName }}/{{ item?.payeePhone }}
- {{ item.billCode }} - {{ item.billCode }} + {{ item.billCode }} + {{ item.billCode }}
{{ item?.billStatusLabel }}
- {{item?.resourceTypeLabel}}{{item?.serviceTypeLabel}} + {{item?.billTypeLabel}}{{item?.serviceTypeLabel}}
From cdb22c78f1f172dc392754c9b095fc91ae325d6e Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Thu, 24 Mar 2022 09:57:50 +0800 Subject: [PATCH 20/99] edit --- .../withdrawals-detail.component.html | 41 ++++- .../withdrawals-detail.component.less | 10 +- .../withdrawals-detail.component.ts | 148 +++++++++++++++++- .../withdrawals-record.component.ts | 27 ++-- 4 files changed, 205 insertions(+), 21 deletions(-) diff --git a/src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.html b/src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.html index 8e03e6a1..cf8b7148 100644 --- a/src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.html +++ b/src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.html @@ -54,10 +54,39 @@
- -
-
- -
-
+ + +
+
+ +
+
+ + + + +
+
+ + + {{index+1}} + + + + +
+
+ +
+
+ + \ No newline at end of file diff --git a/src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.less b/src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.less index e299b7d1..627355a5 100644 --- a/src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.less +++ b/src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.less @@ -5,13 +5,19 @@ border : 1px solid #dbdbdb; .ant-alert-message { - color: rgba(0, 0, 0, 0.85); + color : rgba(0, 0, 0, 0.85); font-weight: 600; - font-size: 16px; + font-size : 16px; } } .ant-form-item { margin-bottom: 15px; } + + nz-tabs-nav { + background-color: #f3f3f3; + border : 1px solid #dbdbdb; + padding-left : 18px; + } } \ No newline at end of file diff --git a/src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.ts b/src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.ts index c184fa93..c63852e5 100644 --- a/src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.ts +++ b/src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.ts @@ -1,5 +1,7 @@ -import { Component, OnInit } from '@angular/core'; +import { Component, OnInit, ViewChild } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; +import { STColumn, STRequestOptions } from '@delon/abc/st'; +import { SFComponent, SFSchema } from '@delon/form'; import { FreightAccountService } from '../../../services/freight-account.service'; @Component({ @@ -8,17 +10,37 @@ import { FreightAccountService } from '../../../services/freight-account.service styleUrls: ['./withdrawals-detail.component.less'] }) export class WithdrawalsDetailComponent implements OnInit { + @ViewChild('st', { static: true }) + st!: Component; + @ViewChild('sf', { static: false }) + inputSF!: SFComponent; + columns: STColumn[] = this.initST(); + inputSearchSchema: SFSchema = this.initInputSF(); + _$expand = false; + formData: any = {}; timeLineData: any = []; + accountType = '1'; + constructor(public service: FreightAccountService, private route: ActivatedRoute) { const id = route.snapshot.params.id; + this.accountType = route.snapshot.queryParams.type; this.loadRefundDetail(id); } ngOnInit(): void {} + beforeReq = (requestOptions: STRequestOptions) => { + if (this.inputSF.value) { + Object.assign(requestOptions.body, { + ...this.inputSF.value + }); + } + return requestOptions; + }; + loadRefundDetail(id: string) { this.service.request(this.service.$api_get_refund_detail, { id }).subscribe(res => { if (res) { @@ -80,7 +102,131 @@ export class WithdrawalsDetailComponent implements OnInit { }); } + /** + * 重置表单 + */ + resetInputSF() { + this.inputSF.reset(); + } + + /** + * 伸缩查询条件 + */ + expandToggle() { + this._$expand = !this._$expand; + this.inputSF?.setValue('/expand', this._$expand); + } + goBack() { history.go(-1); } + + private initInputSF(): SFSchema { + return { + properties: { + expand: { + type: 'boolean', + ui: { + hidden: true + } + }, + billHCode: { + type: 'string', + title: '支付编号', + ui: { + placeholder: '请输入' + } + }, + billHCod1e: { + type: 'string', + title: '订单号', + ui: { + placeholder: '请输入' + } + }, + billHCo1de: { + type: 'string', + title: '货源编号', + ui: { + placeholder: '请输入' + } + }, + billHC1ode: { + type: 'string', + title: '服务类型', + ui: { + widget: 'select', + placeholder: '请选择', + visibleIf: { + expand: (value: boolean) => value + } + } + }, + billHCo11de: { + type: 'string', + title: '承运司机', + ui: { + placeholder: '请输入司机姓名/手机号', + visibleIf: { + expand: (value: boolean) => value + } + } + }, + billHCo111de: { + type: 'string', + title: '车牌号', + ui: { + placeholder: '请输入', + visibleIf: { + expand: (value: boolean) => value + } + } + }, + billHC1o11de: { + type: 'string', + title: '收款人', + ui: { + placeholder: '请输入收款人姓名/手机号', + visibleIf: { + expand: (value: boolean) => value + } + } + }, + billHC1o111de: { + type: 'string', + title: '车队长收款', + ui: { + widget: 'select', + placeholder: '请选择', + visibleIf: { + expand: (value: boolean) => value + } + } + } + } + }; + } + + private initST(): STColumn[] { + return [ + { title: '支付编号', index: 'brmHCode', className: 'text-left', width: 200 }, + { + title: '支付金额', + index: 'yskmoney', + type: 'widget', + className: 'text-right', + widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.yskmoney }) }, + width: 140 + }, + { title: '运费明细', index: 'billHId', className: 'text-center', width: 150 }, + { title: '货主', index: 'billHId', className: 'text-center', width: 150 }, + { title: '订单号', index: 'billHId', className: 'text-center', width: 150 }, + { title: '运单号', index: 'billHId', className: 'text-center', width: 150 }, + { title: '货源编号', index: 'billHId', className: 'text-center', width: 150 }, + { title: '服务类型', index: 'billHId', className: 'text-center', width: 150 }, + { title: '承运司机', index: 'billHId', className: 'text-center', width: 150 }, + { title: '收款人', index: 'billHId', className: 'text-center', width: 150 }, + { title: '银行类型', index: 'billHId', className: 'text-center', width: 150 } + ]; + } } diff --git a/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.ts b/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.ts index 8d994f80..5d58f9bc 100644 --- a/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.ts +++ b/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.ts @@ -28,9 +28,9 @@ export class WithdrawalsRecordComponent { refundStatus: any = ''; msg = ''; - constructor(public service: FreightAccountService, private nzModalService: NzModalService, private router: Router) { } + constructor(public service: FreightAccountService, private nzModalService: NzModalService, private router: Router) {} - ngOnInit(): void { } + ngOnInit(): void {} beforeReq = (requestOptions: STRequestOptions) => { if (this.sf) { @@ -254,7 +254,7 @@ export class WithdrawalsRecordComponent { { title: '提现单号', index: 'refundApplyCode', width: 120 }, { title: '网络货运人', index: 'ltdName', width: 140 }, { title: '银行类型', index: 'bankTypeLabel', width: 100 }, - { title: '账户类型', index: 'bankTypeLabel', width: 100 }, + { title: '账户类型', index: 'accountType', width: 100 }, { title: '账户名称', index: 'bankAccountName', width: 140 }, { title: '虚拟账户', index: 'virtualAccount', width: 100 }, { @@ -276,6 +276,18 @@ export class WithdrawalsRecordComponent { width: '110px', className: 'text-center', buttons: [ + { + text: '审核', + iif: item => item.refundStatus === '1', + click: item => this.auditAction(item) + }, + { + text: '详情
', + click: item => + this.router.navigate([`/financial-management/withdrawals-record/detail/${item.id}`], { + queryParams: { type: item.accountType } + }) + }, { text: '查看回单', iif: item => item.refundStatus === '3', @@ -287,15 +299,6 @@ export class WithdrawalsRecordComponent { bussType: '06', ltdId: item.ltdId }) - }, - { - text: '审核', - iif: item => item.refundStatus === '1', - click: item => this.auditAction(item) - }, - { - text: '详情', - click: item => this.router.navigate([`/financial-management/withdrawals-record/detail/${item.id}`]) } ] } From fcce660beaf4a2ce6aa730931f83de64f6b4c05b Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Thu, 24 Mar 2022 10:04:03 +0800 Subject: [PATCH 21/99] edit --- .../cancellation-invoice.component.html | 3 +++ .../cancellation-invoice.component.ts | 23 ++++++++++--------- .../invoiced-list/invoiced-list.component.ts | 13 ++++++++++- 3 files changed, 27 insertions(+), 12 deletions(-) diff --git a/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.html b/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.html index 19420a9d..5670e063 100644 --- a/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.html +++ b/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.html @@ -65,6 +65,9 @@ + + + \ No newline at end of file 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 7bd939b9..b394a349 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 @@ -29,10 +29,10 @@ export class CancellationInvoiceComponent implements OnInit { selectedRows: any[] = []; totalCallNo = 0; - openInfo: any = { invoicedate: null, invoiceno: null }; - constructor(public service: TicketService, private nzModalService: NzModalService, private router: Router) { } + openInfo: any = { invoicedate: null, invoiceno: null, invoiceno2: null }; + constructor(public service: TicketService, private nzModalService: NzModalService, private router: Router) {} - ngOnInit(): void { } + ngOnInit(): void {} beforeReq = (requestOptions: STRequestOptions) => { if (this.sf) { @@ -78,7 +78,7 @@ export class CancellationInvoiceComponent implements OnInit { * @param item */ requestedAction(item: any) { - this.openInfo = { invoicedate: null, invoiceno: null }; + this.openInfo = { invoicedate: null, invoiceno: null, invoiceno2: null }; const modal = this.nzModalService.create({ nzTitle: '发票确认', nzContent: this.requestedModal, @@ -89,7 +89,8 @@ export class CancellationInvoiceComponent implements OnInit { } const params = { invoiceno: this.openInfo.invoiceno, - invoicedate: dateTimePickerUtil.format(this.openInfo.invoicedate) + invoicedate: dateTimePickerUtil.format(this.openInfo.invoicedate), + invoiceno2: this.openInfo.invoiceno2 }; this.service .request(this.service.$api_apply_fico_invoic, { @@ -154,7 +155,7 @@ export class CancellationInvoiceComponent implements OnInit { this.nzModalService.warning({ nzTitle: '确定将所选待确认开票申请撤回？', nzContent: '提交税控后发票信息不可修改，待税控开票完成后返回开票结果', - nzOnOk: () => { } + nzOnOk: () => {} }); } @@ -170,7 +171,7 @@ export class CancellationInvoiceComponent implements OnInit { this.nzModalService.warning({ nzTitle: '确定将所选待确认开票申请撤回？', nzContent: '提交税控后发票信息不可修改，待税控开票完成后返回开票结果', - nzOnOk: () => { } + nzOnOk: () => {} }); } @@ -369,22 +370,22 @@ export class CancellationInvoiceComponent implements OnInit { buttons: [ { type: 'divider' }, { - text: '查看明细', + text: '查看明细
', click: item => this.router.navigate(['ticket/cancellation-invoice/detail/' + item.id], { queryParams: { type: 1, expressno: item.expressno, ltdId: item.shipperId } }) }, { - text: '手工开票', + text: '手工开票
', iif: item => item.sts != '3', click: item => this.requestedAction(item) }, { - text: '推送开票', + text: '推送开票
', iif: item => item.sts === '1', click: item => this.pushInvoiceAction(item) - }, + } // { // text: '作废发票', // iif: item => item.sts === '3', diff --git a/src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.ts b/src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.ts index 0662aa43..ec52f839 100644 --- a/src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.ts +++ b/src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.ts @@ -137,6 +137,13 @@ export class InvoicedListComponent implements OnInit { autocomplete: 'off' } }, + invoiceno2: { + type: 'string', + title: '发票代码', + ui: { + autocomplete: 'off' + } + }, vatappHCode: { type: 'string', title: '申请编号', @@ -151,7 +158,10 @@ export class InvoicedListComponent implements OnInit { widget: 'sl-from-to-search', format: 'yyyy-MM-dd', placeholder: '请选择', - nzShowTime: true + nzShowTime: true, + visibleIf: { + expand: (value: boolean) => value + } } as SFDateWidgetSchema }, artoname: { @@ -196,6 +206,7 @@ export class InvoicedListComponent implements OnInit { return [ { title: '', index: 'key', type: 'checkbox' }, { title: '发票号码', index: 'invoiceno', width: 150 }, + { title: '发票代码', index: 'invoiceno2', width: 150 }, { title: '申请编号', index: 'vatappHCode', From cc8cf5c64daf63ce77c2dc4f2209a2789b4e3aa2 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 24 Mar 2022 10:22:06 +0800 Subject: [PATCH 22/99] fix bug --- .../receipts-audit.component.ts | 22 +++++++++++-------- .../order-agreement.component.ts | 18 +++++++++++++++ .../passport/services/passport.service.ts | 4 +++- 3 files changed, 34 insertions(+), 10 deletions(-) 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 8158747b..4bc90518 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 @@ -272,19 +272,23 @@ export class OrderManagementReceiptsAuditComponent implements OnInit { } } as SFSelectWidgetSchema }, - settlementBasis: { - title: '装卸凭证', + loadingDocuments: { type: 'string', + title: '装卸货凭证', + enum:[ + {label: '全部',value: ''}, + {label: '有',value: '1'}, + {label: '无',value: '0'}, + ], ui: { - widget: 'dict-select', - containsAllLabel: true, - params: { dictKey: 'goodresource:settlement:type' }, - containAllLable: true, + widget: 'select', + placeholder: '请选择', + allowClear: true, visibleIf: { _$expand: (value: boolean) => value - } - } as SFSelectWidgetSchema - } + }, + } + }, }, type: 'object' }; diff --git a/src/app/routes/passport/components/order-agreement/order-agreement.component.ts b/src/app/routes/passport/components/order-agreement/order-agreement.component.ts index 713b32cf..1d8b0139 100644 --- a/src/app/routes/passport/components/order-agreement/order-agreement.component.ts +++ b/src/app/routes/passport/components/order-agreement/order-agreement.component.ts @@ -1,3 +1,13 @@ +/* + * @Description : + * @Version : 1.0 + * @Author : Shiming + * @Date : 2022-03-14 14:17:38 + * @LastEditors : Shiming + * @LastEditTime : 2022-03-24 10:12:00 + * @FilePath : \\tms-obc-web\\src\\app\\routes\\passport\\components\\order-agreement\\order-agreement.component.ts + * Copyright (C) 2022 huzhenhong. All rights reserved. + */ import { Component, OnInit } from '@angular/core'; import { ActivatedRoute, Params } from '@angular/router'; import { PassportService } from '../../services/passport.service'; @@ -16,6 +26,14 @@ export class OrderAgreementComponent implements OnInit { }); } ngOnInit() { + console.log(this.type); + if(this.type == 3) { + this.service.request(this.service.$api_get_getSupplementaryAgreement, { type: this.type }).subscribe(res => { + if (res) { + this.agreementContent = res; + } + }); + } this.service.request(this.service.$api_get_agreement, { type: this.type }).subscribe(res => { if (res) { this.agreementContent = res; diff --git a/src/app/routes/passport/services/passport.service.ts b/src/app/routes/passport/services/passport.service.ts index bcd3f5c1..bb23b727 100644 --- a/src/app/routes/passport/services/passport.service.ts +++ b/src/app/routes/passport/services/passport.service.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-27 21:08:36 * @LastEditors : Shiming - * @LastEditTime : 2022-01-18 17:24:52 + * @LastEditTime : 2022-03-24 09:59:50 * @FilePath : \\tms-obc-web\\src\\app\\routes\\passport\\services\\passport.service.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -17,6 +17,8 @@ import { BaseService } from 'src/app/shared/services/core/base.service'; export class PassportService extends BaseService { // 登录协议，服务订购协议 public $api_get_agreement = `/api/mdc/pbc/agreementInfo/getAgreementInfoByType?_allow_anonymous=true`; + // 查看补充协议 + public $api_get_getSupplementaryAgreement = `/api/sdc/billOperate/getSupplementaryAgreement?_allow_anonymous=true`; // 未登录账号发送验证码 public $getAccountSMVerificationCode = `/api/mdc/cuc/userBasicInfo/forgetPassword/getAccountSMVerificationCode?_allow_anonymous=true`; constructor(public injector: Injector) { From 076410a790de8603c50ae92a5f796361fb2fe04d Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 24 Mar 2022 10:29:42 +0800 Subject: [PATCH 23/99] fix bug --- .../modal/vehicle/modify-captain/modify-captain.component.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/routes/order-management/modal/vehicle/modify-captain/modify-captain.component.ts b/src/app/routes/order-management/modal/vehicle/modify-captain/modify-captain.component.ts index 78c7517e..845db74c 100644 --- a/src/app/routes/order-management/modal/vehicle/modify-captain/modify-captain.component.ts +++ b/src/app/routes/order-management/modal/vehicle/modify-captain/modify-captain.component.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-30 14:45:39 * @LastEditors : Shiming - * @LastEditTime : 2022-01-18 17:23:11 + * @LastEditTime : 2022-03-24 10:28:48 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\modify-captain\\modify-captain.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -96,7 +96,7 @@ export class VehicleModifyCaptainComponent implements OnInit { console.log(this.bankData); const params = { billIds: this.data?.ids, - carCaptainId: value.id, + carCaptainId: value.appUserId, bankData: this.bankData }; this.service.request(this.service.$api_get_updateCarCaptainBatch, params).subscribe((res: any) => { From 79ec9901c15e89d9c784c66a4f58693979de2d36 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Thu, 24 Mar 2022 10:32:56 +0800 Subject: [PATCH 24/99] edit --- .../receipt-order.component.html | 2 +- .../receipt-order/receipt-order.component.ts | 46 +++++++++---------- 2 files changed, 24 insertions(+), 24 deletions(-) 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 b19413b8..4a6767b4 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 @@ -16,7 +16,7 @@ -
+
@@ -96,7 +96,7 @@ - + @@ -117,9 +117,11 @@
- + + +
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 c9a89f61..1ff042b0 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 @@ -1,10 +1,11 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; import { STComponent, STColumn, STChange } from '@delon/abc/st'; -import { SFCascaderWidgetSchema, SFComponent, SFRadioWidgetSchema, SFSchema, SFUISchema } from '@delon/form'; +import { SFCascaderWidgetSchema, SFComponent, SFRadioWidgetSchema, SFSchema, SFSchemaEnum, SFSelectWidgetSchema, SFUISchema } from '@delon/form'; import { DynamicSettingModalComponent, SinglepageSettingModalComponent } from '@shared'; import { NzModalService } from 'ng-zorro-antd/modal'; -import { takeLast } from 'rxjs/operators'; +import { of } from 'rxjs'; +import { map, takeLast } from 'rxjs/operators'; import { AccountDetailComponent } from 'src/app/shared/components/account-detail/account-detail.component'; import { SystemService } from '../../services/system.service'; @@ -20,26 +21,33 @@ export class NetworkFreightComponent implements OnInit { @ViewChild('sfFre', { static: false }) sfFre!: SFComponent; @ViewChild('sfTicket', { static: false }) sfTicket!: SFComponent; @ViewChild('sfTax', { static: false }) sfTax!: SFComponent; + @ViewChild('sfNC', { static: false }) sfNC!: SFComponent; ui: SFUISchema = {}; ui2: SFUISchema = {}; ui3: SFUISchema = {}; ui4: SFUISchema = {}; + ui5: SFUISchema = {}; schema: SFSchema = {}; addSchema: SFSchema = {}; ticketSchema: SFSchema = {}; TaxSchema: SFSchema = {}; - _$expand = false; - taxStatus = false; + NCSchema: SFSchema = {}; + _$expand :boolean= false; + taxStatus :boolean= false; + TicketStatus :boolean= true; + NCStatus :boolean = false; formData: any; ticketId: any; ticketItem: any; formDataTicket: any; + formDataNC: any; formDataTax: any; + NCID: string = ''; isVisible = false; isVisibleTicket = false; edit = false; editId = false; - tabs: any[] = [{ name: '开票设置' }, { name: '税务设置' }]; + tabs: any[] = [{ name: '开票设置' }, { name: '税务设置' }, { name: 'NC设置' }]; columns: STColumn[] = [ { @@ -350,6 +358,42 @@ export class NetworkFreightComponent implements OnInit { }; this.ui4 = { '*': { spanLabelFixed: 120, grid: { span: 24 } } }; } + initSFNC() { + this.NCSchema = { + properties: { + crmCustomerId: { + type: 'string', + title: 'CRM客户编码', + ui: { + widget: 'select', + serverSearch: true, + searchDebounceTime: 300, + searchLoadingText: '搜索中...', + visibleIf: { + _$expand: (value: boolean) => value + }, + allowClear: true, + onSearch: (q: any) => { + let str = q.replace(/^\s+|\s+$/g, ''); + if (str) { + console.log(str); + + return this.service + .request(this.service.$api_get_crmCustomer_page, { customerName: str }) + .pipe(map((res: any) => (res.records as any[]).map(i => ({ label: i.customerName, value: i.id } as SFSchemaEnum)))) + .toPromise(); + } else { + return of([]); + } + } + } as SFSelectWidgetSchema + }, + }, + required: ['crmCustomerId'] + }; + this.ui5 = { '*': { spanLabelFixed: 120, grid: { span: 24 } } }; + + } initSFFre() { this.addSchema = { properties: { @@ -397,36 +441,44 @@ export class NetworkFreightComponent implements OnInit { // 财务设置 ticket(value: any) { this.formDataTicket = []; + this.formDataNC = []; this.formDataTax = []; this.ticketItem = value; + this.taxStatus = false + this.TicketStatus = true + this.NCStatus = false this.initSFTax(); + this.initSFNC(); this.initSFTicket(); - this.service.request(this.service.$api_getTicketByNetworkTransporterId, { id: value.id }).subscribe((res: any) => { - console.log(res); - if (res) { - let List = { - ...res - }; - delete List.senderRegionCode; - (List.senderRegionCode = this.getProvinceData(res?.senderRegionCode)), (this.formDataTicket = List); - this.ticketId = res.id; - } - }); + this.NCID = value.id; + if(this.TicketStatus) { + console.log('9999999'); + + this.service.request(this.service.$api_getTicketByNetworkTransporterId, { id: value.id }).subscribe((res: any) => { + console.log(res); + if (res) { + let List = { + ...res + }; + delete List.senderRegionCode; + (List.senderRegionCode = this.getProvinceData(res?.senderRegionCode)), (this.formDataTicket = List); + this.ticketId = res.id; + } + }); + } this.isVisibleTicket = true; } getProvinceData(value: any) { this.service.http.post(this.service.$api_getRegionDetailByCode, { regionCode: value }).subscribe(res => { - console.log(res.data); - console.log(this.formDataTicket); let enterpriseAddressCode: any = []; let regioin = res?.data?.regionFullCodes.split(','); - console.log(regioin); regioin?.forEach((element: any) => { enterpriseAddressCode.push(Number(element)); }); - console.log(enterpriseAddressCode); - this.sfTicket.setValue('/senderRegionCode', enterpriseAddressCode); - return enterpriseAddressCode; + if(this.TicketStatus) { + this.sfTicket.setValue('/senderRegionCode', enterpriseAddressCode); + return enterpriseAddressCode; + } }); } deleteAction(item?: any) { @@ -517,27 +569,56 @@ export class NetworkFreightComponent implements OnInit { this.isVisibleTicket = false; } handleOKTicket() { - console.log(this.sfTicket.valid); - console.log(this.sfTicket.value); - if (!this.sfTicket.valid) { - this.service.msgSrv.warning('请正确填写完整！'); - return; - } - const params = { - ...this.sfTicket.value - }; - if (this.ticketId) { - params.id = this.ticketId; - } - params.senderRegionCode = this.sfTicket.value.senderRegionCode[2]; - console.log(params); - this.service.request(this.service.$api_networkTransporterTicket_save, params).subscribe((res: any) => { - if (res) { - this.service.msgSrv.success('保存成功！'); - this.isVisibleTicket = false; - this.st.reload(1); + console.log( this.taxStatus, this.TicketStatus,this.NCStatus); + if(this.TicketStatus) { + console.log(this.sfTicket); + console.log(this.sfTicket.value); + + if (!this.sfTicket.valid) { + this.service.msgSrv.warning('请正确填写完整！'); + return; } - }); + const params = { + ...this.sfTicket.value + }; + if (this.ticketId) { + params.id = this.ticketId; + } + params.senderRegionCode = this.sfTicket.value.senderRegionCode[2]; + console.log(params); + this.service.request(this.service.$api_networkTransporterTicket_save, params).subscribe((res: any) => { + if (res) { + this.service.msgSrv.success('保存成功！'); + this.isVisibleTicket = false; + this.st.reload(1); + } + }); + } else if(this.NCStatus){ + console.log(this.sfNC); + console.log(this.formDataNC); + console.log(this.sfNC?.value); + + if (!this.sfNC.valid) { + this.service.msgSrv.warning('请正确填写完整！'); + return; + } + const params = { + ...this.sfNC.value + }; + if (this.NCID) { + params.id = this.NCID; + } + console.log(params); + this.service.request(this.service.$api_setCrmCustomer, params).subscribe((res: any) => { + if (res) { + this.service.msgSrv.success('保存成功！'); + this.isVisibleTicket = false; + this.st.reload(1); + } + }); + // api_setCrmCustomer + } + } handleOK() { @@ -571,11 +652,19 @@ export class NetworkFreightComponent implements OnInit { return this.service.request(this.service.$api_get_region_by_code, { regionCode }); } changeType(value: any) { - console.log(value); if (value.name === '税务设置') { this.taxStatus = true; - } else { + this.TicketStatus = false; + this.NCStatus = false; + } else if (value.name === '开票设置'){ + this.TicketStatus = true; + this.NCStatus = false; this.taxStatus = false; + } else if (value.name === 'NC设置'){ + this.NCStatus = true; + this.TicketStatus = false; + this.taxStatus = false; + } } // 新增 diff --git a/src/app/routes/sys-setting/services/system.service.ts b/src/app/routes/sys-setting/services/system.service.ts index ce4b3cfe..0a698775 100644 --- a/src/app/routes/sys-setting/services/system.service.ts +++ b/src/app/routes/sys-setting/services/system.service.ts @@ -173,6 +173,8 @@ export class SystemService extends BaseService { $api_ocr_recognize_id_card = '/api/mdc/pbc/hwc/ocr/recognizeIdCard'; // 获取字典 $api_getDictValue = '/api/mdc/pbc/dictItems/getDictValue'; + // 设置crm客户 + $api_setCrmCustomer = '/api/mdc/cuc/networkTransporter/setCrmCustomer'; // 获取一、二、三级地区详情 $api_getRegionToThree = '/api/mdc/pbc/region/getRegionToThree'; $api_getRoleTemplateInfo: string = ''; From ba808581fb10844671d9aadae3111a750f49a17c Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 24 Mar 2022 13:51:08 +0800 Subject: [PATCH 27/99] fix bug --- .../components/vehicle-detail/vehicle-detail.component.html | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.html b/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.html index c45de3e6..53ee6a60 100644 --- a/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.html +++ b/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.html @@ -1,7 +1,7 @@ diff --git a/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html b/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html index 21751cfb..4a638401 100644 --- a/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html +++ b/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html @@ -27,7 +27,7 @@
{{ i?.enterpriseInfoName }} {{ i?.shippername }} - {{i?.enterpriseProject}} + {{i?.enterpriseProjectName}} {{i?.serviceTypeLabel}} {{i?.dispatchName}} /{{i?.dispatchPhone}} {{ i?.externalBillCode }} diff --git a/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.html b/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.html index 53ee6a60..352f900e 100644 --- a/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.html +++ b/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.html @@ -27,7 +27,7 @@
{{ i?.enterpriseInfoName }} {{ i?.shippername }} - {{i?.enterpriseProject}} + {{i?.enterpriseProjectName}} {{i?.serviceTypeLabel}} {{i?.dispatchName}} /{{i?.dispatchPhone}} {{ i?.externalBillCode }} From 5d60e807838641f0fe76821092333ef2ad15af00 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 24 Mar 2022 14:12:17 +0800 Subject: [PATCH 32/99] fix bug --- .../components/risk-detail/risk-detail.component.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/routes/order-management/components/risk-detail/risk-detail.component.html b/src/app/routes/order-management/components/risk-detail/risk-detail.component.html index 5240118d..bfceb298 100644 --- a/src/app/routes/order-management/components/risk-detail/risk-detail.component.html +++ b/src/app/routes/order-management/components/risk-detail/risk-detail.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-16 10:19:08 * @LastEditors : Shiming - * @LastEditTime : 2022-03-23 19:12:19 + * @LastEditTime : 2022-03-24 14:12:14 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\risk-detail\\risk-detail.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -21,7 +21,7 @@ {{i?.representationsStatusLabel}} - {{i?.driverName ? i?.driverName + '/': ''}} {{i?.driverPhone ?i?.driverPhone + '/': '' }} {{i?.carId}} + {{i?.driverName ? i?.driverName + '/': ''}} {{i?.driverPhone ?i?.driverPhone + '/': '' }} {{i?.carNo}} {{i?.carCaptainName ? i?.carCaptainName+ '/' : ''}}{{i?.carCaptainPhone}} {{i?.loadTime}} {{i?.unloadTime}} From 0dd36d8c7f3406a6d96d221abc66e9e3de34f60a Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 24 Mar 2022 14:20:58 +0800 Subject: [PATCH 33/99] fix bug --- .../driver/captain/add/add.component.html | 17 +++- .../driver/captain/add/add.component.ts | 86 +++++++++++-------- 2 files changed, 63 insertions(+), 40 deletions(-) diff --git a/src/app/routes/usercenter/components/driver/captain/add/add.component.html b/src/app/routes/usercenter/components/driver/captain/add/add.component.html index 1e60ca0b..fdc58217 100644 --- a/src/app/routes/usercenter/components/driver/captain/add/add.component.html +++ b/src/app/routes/usercenter/components/driver/captain/add/add.component.html @@ -1,7 +1,17 @@ +
添加车队长
-
+
@@ -24,7 +34,6 @@
- - - + +
diff --git a/src/app/routes/usercenter/components/driver/captain/add/add.component.ts b/src/app/routes/usercenter/components/driver/captain/add/add.component.ts index 45f387a7..8a477dc9 100644 --- a/src/app/routes/usercenter/components/driver/captain/add/add.component.ts +++ b/src/app/routes/usercenter/components/driver/captain/add/add.component.ts @@ -90,12 +90,13 @@ export class CtcCaptatinAddComponent implements OnInit { widget: this.i.id ? 'text' : '', placeholder: '请输入手机号', blur: () => { - if(this.sf?.value?.mobile) { + if(!this.sf.value.mobile) { + return + } this.service.request(this.service.$api_getByMobile, { mobile: this.sf.value.mobile }).subscribe(res => { if (res.certificateNumber) { this.readFlag = true this.detailData = { - ...res, mobile: this.sf.value.mobile, bankName: this.sf.value.bankName, bankCardNo: this.sf.value.bankCardNo, @@ -109,28 +110,41 @@ export class CtcCaptatinAddComponent implements OnInit { url: res.certificatePhotoFrontWatermark, response: res.certificatePhotoFrontWatermark, }], - certificatePhotoBackWatermark: [ - { - uid: -1, - name: 'LOGO', - status: 'done', - url: res.certificatePhotoBackWatermark, - response: res.certificatePhotoBackWatermark, - }], - name: res.name, - certificateNumber: res.certificateNumber, - certificatePhotoFront: res.certificatePhotoFront, - certificatePhotoBack: res.certificatePhotoBack, + certificatePhotoBackWatermark: [ + { + uid: -1, + name: 'LOGO', + status: 'done', + url: res.certificatePhotoBackWatermark, + response: res.certificatePhotoBackWatermark, + }], + name: res.name, + certificateNumber: res.certificateNumber, + certificatePhotoFront: res.certificatePhotoFront, + certificatePhotoBack: res.certificatePhotoBack, } } this.initSF() } else { this.readFlag = false - this.detailData = {} + this.detailData = { + mobile: this.sf.value.mobile, + bankName: this.sf.value.bankName, + bankCardNo: this.sf.value.bankCardNo, + remark: this.sf.value.remark, + identityInfoDTO: { + certificatePhotoFrontWatermark: '', + certificatePhotoBackWatermark: '', + name: '', + certificateNumber: '', + certificatePhotoFront: '', + certificatePhotoBack: '', + } + } + this.initSF() } }) - } - } + } }, default: this.detailData.mobile }, @@ -138,7 +152,7 @@ export class CtcCaptatinAddComponent implements OnInit { title: '姓名', type: 'string', ui: { - widget: this.i.id ? 'text' : '', + widget: this.i.id && (this.i.driverLicenseStatus === 10 || this.i.driverLicenseStatus === 20) ? 'text' : '', placeholder: '请输入姓名', }, readOnly: this.readFlag, @@ -147,12 +161,11 @@ export class CtcCaptatinAddComponent implements OnInit { bankCardNo: { title: '银行卡号', type: 'string', - maxLength: 20, ui: { - widget: this.i.id ? 'text' : '', + widget: '', placeholder: '请输入银行卡号', - change: (val: any) =>{ - const value = val.replace(/\D/g,'') + change: (val: any) => { + const value = val.replace(/\D/g, '') this.sf.setValue('/bankCardNo', value) }, errors: { @@ -164,9 +177,8 @@ export class CtcCaptatinAddComponent implements OnInit { bankName: { title: '开户行', type: 'string', - maxLength: 35, ui: { - widget: this.i.id ? 'text' : '', + widget: '', placeholder: '请输入开户行', }, default: this.detailData.bankName @@ -178,7 +190,7 @@ export class CtcCaptatinAddComponent implements OnInit { ui: { widget: 'textarea', showRequired: true, - borderless:true, + borderless: true, }, default: '请上传身份证原件的高清照片，若上传复印件，则需加盖公司印章及法人签字；上传后系统会自动识别并填写', }, @@ -193,11 +205,11 @@ export class CtcCaptatinAddComponent implements OnInit { certificatePhotoFrontWatermark: { type: 'string', title: '', - readOnly: this.i.id || this.readFlag, + readOnly: (this.i.id && (this.i.driverLicenseStatus === 10 || this.i.driverLicenseStatus === 20)) || this.readFlag, ui: { offsetControl: 6, action: apiConf.fileUpload, - fileType: 'image/png,image/jpeg,image/jpg,image/gif', + accept: 'image/png,image/jpeg,image/jpg,image/gif', limit: 1, limitFileCount: 1, resReName: 'data.fullFileWatermarkPath', @@ -212,10 +224,10 @@ export class CtcCaptatinAddComponent implements OnInit { listType: 'picture-card', change: (args: any) => { if (args.type === 'success') { - this.detailData.certificatePhotoFront = args.file.response.data.fullFilePath + this.detailData.identityInfoDTO.certificatePhotoFront = args.file.response.data.fullFilePath this.checkIdCard(args.file.response.data.fullFilePath, 'front'); } else { - this.detailData.certificatePhotoFront = '' + this.detailData.identityInfoDTO.certificatePhotoFront = '' } }, beforeUpload: (file: any, _fileList: any) => { @@ -230,6 +242,7 @@ export class CtcCaptatinAddComponent implements OnInit { observer.complete(); }); }, + previewFile: (file: any) => { } }, default: this.detailData.identityInfoDTO.certificatePhotoFrontWatermark }, @@ -244,11 +257,11 @@ export class CtcCaptatinAddComponent implements OnInit { certificatePhotoBackWatermark: { type: 'string', title: '', - readOnly: this.i.id || this.readFlag, + readOnly: (this.i.id && (this.i.driverLicenseStatus === 10 || this.i.driverLicenseStatus === 20)) || this.readFlag, ui: { offsetControl: 6, action: apiConf.fileUpload, - fileType: 'image/png,image/jpeg,image/jpg,image/gif', + accept: 'image/png,image/jpeg,image/jpg,image/gif', limit: 1, limitFileCount: 1, resReName: 'data.fullFileWatermarkPath', @@ -263,9 +276,9 @@ export class CtcCaptatinAddComponent implements OnInit { listType: 'picture-card', change: (args: any) => { if (args.type === 'success') { - this.detailData.certificatePhotoBack = args.file.response.data.fullFilePath + this.detailData.identityInfoDTO.certificatePhotoBack = args.file.response.data.fullFilePath } else { - this.detailData.certificatePhotoBack = '' + this.detailData.identityInfoDTO.certificatePhotoBack = '' } }, beforeUpload: (file: any, _fileList: any) => { @@ -280,15 +293,16 @@ export class CtcCaptatinAddComponent implements OnInit { observer.complete(); }); }, + previewFile: (file: any) => { } }, default: this.detailData.identityInfoDTO.certificatePhotoBackWatermark }, certificateNumber: { title: '身份证号', type: 'string', - readOnly: this.readFlag, + readOnly: (this.i.id && (this.i.driverLicenseStatus === 10 || this.i.driverLicenseStatus === 20)) || this.readFlag, ui: { - widget: this.i.id ? 'text' : '', + widget: this.i.id && (this.i.driverLicenseStatus !== 10 && this.i.driverLicenseStatus !== 20) ? 'text' : '', placeholder: '请输入身份证号', }, default: this.detailData.identityInfoDTO.certificateNumber @@ -298,7 +312,7 @@ export class CtcCaptatinAddComponent implements OnInit { type: 'string', maxLength: 100, ui: { - widget: this.i.id ? 'text' : 'textarea', + widget: 'textarea', placeholder: '请输入备注', autosize: { minRows: 2, maxRows: 6 }, }, From ca4d1bd219544da6c2d95bde150389009b02821e Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 24 Mar 2022 14:22:51 +0800 Subject: [PATCH 34/99] fix bug --- .../driver/captain/add/add.component.less | 65 ++++++++++--------- 1 file changed, 35 insertions(+), 30 deletions(-) diff --git a/src/app/routes/usercenter/components/driver/captain/add/add.component.less b/src/app/routes/usercenter/components/driver/captain/add/add.component.less index bfa10586..fd19d3c9 100644 --- a/src/app/routes/usercenter/components/driver/captain/add/add.component.less +++ b/src/app/routes/usercenter/components/driver/captain/add/add.component.less @@ -1,36 +1,41 @@ .pr { - position: relative; + position: relative; +} + +.pa { + position: absolute; + top: 35px; + left: 150px; + img{border: solid 1px #ebf0fb;} +} + +.tips { + display: flex; + margin-bottom: 0; + color: #333; + + dt { + width: 150px; } - - .pa { - position: absolute; - top: 35px; - left: 150px; - img{border: solid 1px #ebf0fb;} - } - - .tips { - display: flex; + + dd { + width: 190px; margin-bottom: 0; - color: #333; - - dt { - width: 150px; - } - - dd { - width: 190px; - margin-bottom: 0; - text-align: center; - } + text-align: center; } - :host{ - ::ng-deep { - .ant-input-borderless{ - padding: 0; - padding-top: 4px; - color: black; - resize:none; +} +:host{ + ::ng-deep { + .ant-input-borderless{ + padding: 0; + padding-top: 4px; + color: black; + resize:none; + } + .hideBtn .ant-upload-list-item-actions button{ + &:last-child{ + display: none; } } - } \ No newline at end of file + } +} \ No newline at end of file From 290e3a55f7bd4fcbaae616d919408073cfe521e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=98=E6=99=93=E4=BA=91?= Date: Thu, 24 Mar 2022 14:44:18 +0800 Subject: [PATCH 35/99] =?UTF-8?q?=E5=90=88=E4=BC=99=E4=BA=BA=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../account-detail.component.html | 6 ++--- .../components/list/list.component.ts | 2 +- .../recorded-detail.component.html | 26 +++++++++++-------- .../recorded-detail.component.ts | 8 ++++++ 4 files changed, 27 insertions(+), 15 deletions(-) diff --git a/src/app/routes/partner/account-management/components/account-detail/account-detail.component.html b/src/app/routes/partner/account-management/components/account-detail/account-detail.component.html index 47e81e17..b232905e 100644 --- a/src/app/routes/partner/account-management/components/account-detail/account-detail.component.html +++ b/src/app/routes/partner/account-management/components/account-detail/account-detail.component.html @@ -11,13 +11,13 @@ {{headerTotalInfo?.ltdName}} - {{headerTotalInfo?.allAmount |currency}} + {{headerTotalInfo?.allAmount |currency}} - {{headerTotalInfo?.incomeAmount |currency}} + {{headerTotalInfo?.incomeAmount |currency}} - {{headerTotalInfo?.payAmount |currency}} + {{headerTotalInfo?.payAmount |currency}} diff --git a/src/app/routes/partner/account-management/components/list/list.component.ts b/src/app/routes/partner/account-management/components/list/list.component.ts index 1a12dd8c..3d98844e 100644 --- a/src/app/routes/partner/account-management/components/list/list.component.ts +++ b/src/app/routes/partner/account-management/components/list/list.component.ts @@ -59,7 +59,7 @@ export class PartnerAccountManagementListComponent implements OnInit { */ initST() { this.columns = [ - { title: '合伙人名称', index: 'userName', className: 'text-center', width: 250 }, + { title: '合伙人名称', index: 'name', className: 'text-center', width: 250 }, { title: '手机号', index: 'phone', className: 'text-center', width: 200 }, { title: '账户总额（元）', index: 'allBalance', className: 'text-right', sort: true, width: 150, type: 'currency', diff --git a/src/app/routes/partner/account-management/components/recorded-detail/recorded-detail.component.html b/src/app/routes/partner/account-management/components/recorded-detail/recorded-detail.component.html index 0dc738c1..218de752 100644 --- a/src/app/routes/partner/account-management/components/recorded-detail/recorded-detail.component.html +++ b/src/app/routes/partner/account-management/components/recorded-detail/recorded-detail.component.html @@ -8,23 +8,27 @@ - {{summaryObj?.company}} + {{summaryObj?.taxno}} - {{summaryObj?.totalRebate |currency}} + {{(summaryObj?.totalRebate?summaryObj?.totalRebate: 0 )|currency :' + '}} - {{summaryObj?.totalRebate |currency}} + {{(summaryObj?.recordedAmount?summaryObj?.recordedAmount:0 + )|currency:' '}} - {{summaryObj?.taxPersonalSum |currency}} + {{(summaryObj?.taxPersonalSum?summaryObj?.taxPersonalSum:0 + )|currency:' '}} - {{summaryObj?.waitRecordedAmount |currency}} + {{(summaryObj?.waitRecordedAmount?summaryObj?.waitRecordedAmount:0) + |currency:' '}} - {{summaryObj?.name}} + {{summaryObj?.ltdName}} @@ -43,11 +47,11 @@
- 合计 项，收入 项，收入 ，支出 + footerSummary?.spending | currency }}
@@ -55,8 +59,8 @@
- {{detailRecord?.ltdName}} - {{detailRecord?.totalRebate |currency: ' '}} + {{detailRecord?.ltdName}} + {{detailRecord?.totalRebate |currency: ' '}}
diff --git a/src/app/routes/partner/account-management/components/recorded-detail/recorded-detail.component.ts b/src/app/routes/partner/account-management/components/recorded-detail/recorded-detail.component.ts index e86373e0..cf4e33ec 100644 --- a/src/app/routes/partner/account-management/components/recorded-detail/recorded-detail.component.ts +++ b/src/app/routes/partner/account-management/components/recorded-detail/recorded-detail.component.ts @@ -19,6 +19,12 @@ export class PartnerAccountManagementRecordedDetailComponent implements OnInit { taxno: '' }; + footerSummary = { + total: 0, + income: 0, + spending: 0 + } + detailRecord: any = {}; url = `/user`; @@ -156,6 +162,7 @@ export class PartnerAccountManagementRecordedDetailComponent implements OnInit { this.billDetailColumns = []; this.showBillDetail = true; this.initBillDetailST(); + this.detailRecord = record; this.getBillDetail(record?.ltdId); } @@ -169,6 +176,7 @@ export class PartnerAccountManagementRecordedDetailComponent implements OnInit { handleCancel() { this.showBillDetail = false; + this.detailRecord = {}; } goBack() { From 9c21cabd45798a3d6575b6e0bb475e1934a23efc Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 24 Mar 2022 14:49:48 +0800 Subject: [PATCH 36/99] fix bug --- .../network-freight.component.ts | 20 ++++++++++++++++++- 1 file changed, 19 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 1ff042b0..5456947b 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 @@ -466,8 +466,26 @@ export class NetworkFreightComponent implements OnInit { } }); } + if(this.NCStatus) { + this.getNcSetData() + } this.isVisibleTicket = true; } + getNcSetData() { + const List: any = []; + console.log(99999); + this.service.request(this.service.$api_get_crmCustomer, { id: this.ticketItem.crmCustomerId }).subscribe((res: any) => { + console.log(res); + if (res) { + List.push({ label: res.customerName, value: res.id }); + console.log(List); + + this.sfNC.getProperty('/crmCustomerId')!.schema.enum = List; + this.sfNC.getProperty('/crmCustomerId')!.widget.reset(List); + this.sfNC.setValue('/crmCustomerId', res?.id); + } + }); + } getProvinceData(value: any) { this.service.http.post(this.service.$api_getRegionDetailByCode, { regionCode: value }).subscribe(res => { let enterpriseAddressCode: any = []; @@ -661,10 +679,10 @@ export class NetworkFreightComponent implements OnInit { this.NCStatus = false; this.taxStatus = false; } else if (value.name === 'NC设置'){ + this.getNcSetData() this.NCStatus = true; this.TicketStatus = false; this.taxStatus = false; - } } // 新增 From ef7fce7468842ac68144f99c2423896df449b7f8 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 24 Mar 2022 14:54:11 +0800 Subject: [PATCH 37/99] fix bug --- .../components/compliance-audit/compliance-audit.component.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.ts b/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.ts index 3ea3d747..f4477ef8 100644 --- a/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.ts +++ b/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.ts @@ -375,13 +375,13 @@ export class OrderManagementComplianceAuditComponent implements OnInit { title: '审核人', width: '180px', className: 'text-left', - index: 'loadingLadingBillFilePath' + index: 'complianceName' }, { title: '审核时间', width: '180px', className: 'text-left', - index: 'loadingLadingBillFilePath' + index: 'complianceTime' }, { title: '状态', From ae743ee0203ddbc70d1e183a4859a8f00811375b Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Thu, 24 Mar 2022 15:17:24 +0800 Subject: [PATCH 38/99] edit --- .../cancellation-invoice.component.html | 14 ++++++++++---- .../invoice-requested.component.html | 2 +- .../requested-invoice-modal.component.ts | 16 +++++++++++++--- 3 files changed, 24 insertions(+), 8 deletions(-) diff --git a/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.html b/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.html index 5670e063..42bc22e2 100644 --- a/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.html +++ b/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.html @@ -45,12 +45,11 @@ - + {{ item.vatinvcode }}
- + @@ -58,6 +57,13 @@
+ diff --git a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.html b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.html index 091af5f8..3790504f 100644 --- a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.html +++ b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.html @@ -45,7 +45,7 @@ {{ totalCallNo }} 清空
- + 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 802103d3..ed1d8ae9 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 @@ -7,6 +7,7 @@ * @FilePath : \\tms-obc-web\\src\\app\\routes\\ticket-management\\components\\invoice-requested\\requested-invoice-modal\\requested-invoice-modal.component.ts */ import { Component, ViewChild } from '@angular/core'; +import { Router } from '@angular/router'; import { STChange, STColumn, STComponent, STRequestOptions } from '@delon/abc/st'; import { NzModalRef, NzModalService } from 'ng-zorro-antd/modal'; @@ -23,7 +24,7 @@ export class RequestedInvoiceModalComponent { columns: STColumn[] = this.initST(); id: any; selectedRows: any[] = []; - constructor(public service: TicketService, private nzModalService: NzModalService, private modal: NzModalRef) {} + constructor(public service: TicketService, private nzModalService: NzModalService, private modal: NzModalRef, private router: Router) {} beforeReq = (requestOptions: STRequestOptions) => { Object.assign(requestOptions.body, { vatappHId: this.id }); @@ -127,8 +128,17 @@ export class RequestedInvoiceModalComponent { }; this.service.request(this.service.$api_get_applyFicoVatinv, params).subscribe((res: any) => { if (res) { - this.service.msgSrv.success('开票成功'); - this.modal.destroy(true); + this.nzModalService.confirm({ + nzTitle: '是否进入销票处理页面完成开票', + nzOnOk: () => { + this.service.msgSrv.success('开票成功'); + this.modal.destroy(true); + this.router.navigate(['/ticket/cancellation-invoice']); + }, + nzOnCancel: () => { + this.modal.destroy(true); + } + }); } }); } From 23e0a83c565f8e63284084f8836e642fe48f0a37 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 24 Mar 2022 16:01:19 +0800 Subject: [PATCH 39/99] fix bug --- .../complaint-detail.component.ts | 12 +++++++ .../abnormal-appear.component.html | 8 ++--- .../abnormal-appear.component.ts | 32 ++++++++++++++++--- .../components/vehicle/vehicle.component.html | 6 ++-- .../services/waybill-management.service.ts | 12 ++++--- 5 files changed, 54 insertions(+), 16 deletions(-) diff --git a/src/app/routes/order-management/components/complaint-detail/complaint-detail.component.ts b/src/app/routes/order-management/components/complaint-detail/complaint-detail.component.ts index 7851a2a6..1c0a7051 100644 --- a/src/app/routes/order-management/components/complaint-detail/complaint-detail.component.ts +++ b/src/app/routes/order-management/components/complaint-detail/complaint-detail.component.ts @@ -172,6 +172,10 @@ export class OrderManagementComplaintDetailComponent implements OnInit { 查看评价： 3 */ handleCancel(type: string) { + if(!this.sfView.valid) { + this.service.msgSrv.error('请填写处理结果！') + return + } const paramsa = { ...this.sfView.value, handleStatus: 0, @@ -193,6 +197,10 @@ export class OrderManagementComplaintDetailComponent implements OnInit { this.isVisibleRE = false } handleCancel2() { + if(!this.sfView.valid) { + this.service.msgSrv.error('请填写处理结果！') + return + } const paramsa = { id: this.channelId } @@ -212,6 +220,10 @@ export class OrderManagementComplaintDetailComponent implements OnInit { * 审核通过按钮 */ handleOK() { + if(!this.sfView.valid) { + this.service.msgSrv.error('请填写处理结果！') + return + } const paramsa = { ...this.sfView.value, handleStatus: 1, diff --git a/src/app/routes/waybill-management/components/abnormal-appear/abnormal-appear.component.html b/src/app/routes/waybill-management/components/abnormal-appear/abnormal-appear.component.html index 13df6295..a3cf1647 100644 --- a/src/app/routes/waybill-management/components/abnormal-appear/abnormal-appear.component.html +++ b/src/app/routes/waybill-management/components/abnormal-appear/abnormal-appear.component.html @@ -1,7 +1,7 @@ + +

公司名： {{openInfo?.artoname}}

+

税号： {{openInfo?.artotaxno}}

+

注册地址： {{openInfo?.artoadd}}

+

注册电话： {{openInfo?.artotel}}

+

开户行： {{openInfo?.artobank}}

+ + + {{openInfo?.vatname}} + + + {{openInfo?.vatremarks}} + + + {{openInfo?.otherremarks}} + + + {{openInfo?.isdetail?'需要':'不需要'}} + + + {{openInfo?.vatnotax | currency}} + 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 b394a349..e2e9009e 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 @@ -79,34 +79,40 @@ export class CancellationInvoiceComponent implements OnInit { */ requestedAction(item: any) { this.openInfo = { invoicedate: null, invoiceno: null, invoiceno2: null }; - const modal = this.nzModalService.create({ - nzTitle: '发票确认', - nzContent: this.requestedModal, - nzOnOk: () => { - if (!this.openInfo?.invoicedate || !this.openInfo?.invoiceno) { - this.service.msgSrv.warning('请填开票信息'); - return false; - } - const params = { - invoiceno: this.openInfo.invoiceno, - invoicedate: dateTimePickerUtil.format(this.openInfo.invoicedate), - invoiceno2: this.openInfo.invoiceno2 - }; - this.service - .request(this.service.$api_apply_fico_invoic, { - id: item.id, - vatinvcode: item.vatinvcode, - ...params - }) - .subscribe(res => { - if (res) { - this.service.msgSrv.success('开票成功'); - this.st.load(1); - modal.destroy(); + this.service.request(this.service.$api_get_apply_fico_info, { id: item.vatappHId }).subscribe(info => { + if (info) { + console.log(info); + Object.assign(this.openInfo, { ...info }); + const modal = this.nzModalService.create({ + nzTitle: '发票确认', + nzContent: this.requestedModal, + nzOnOk: () => { + if (!this.openInfo?.invoicedate || !this.openInfo?.invoiceno) { + this.service.msgSrv.warning('请填开票信息'); + return false; } - }); + const params = { + invoiceno: this.openInfo.invoiceno, + invoicedate: dateTimePickerUtil.format(this.openInfo.invoicedate), + invoiceno2: this.openInfo.invoiceno2 + }; + this.service + .request(this.service.$api_apply_fico_invoic, { + id: item.id, + vatinvcode: item.vatinvcode, + ...params + }) + .subscribe(res => { + if (res) { + this.service.msgSrv.success('开票成功'); + this.st.load(1); + modal.destroy(); + } + }); - return false; + return false; + } + }); } }); } diff --git a/src/app/routes/ticket-management/components/invoice-requested/requested-invoice-modal/requested-invoice-modal.component.html b/src/app/routes/ticket-management/components/invoice-requested/requested-invoice-modal/requested-invoice-modal.component.html index acde105a..9fa49838 100644 --- a/src/app/routes/ticket-management/components/invoice-requested/requested-invoice-modal/requested-invoice-modal.component.html +++ b/src/app/routes/ticket-management/components/invoice-requested/requested-invoice-modal/requested-invoice-modal.component.html @@ -32,5 +32,5 @@
- +
diff --git a/src/app/routes/ticket-management/services/ticket.service.ts b/src/app/routes/ticket-management/services/ticket.service.ts index d2d66aa4..68508f5a 100644 --- a/src/app/routes/ticket-management/services/ticket.service.ts +++ b/src/app/routes/ticket-management/services/ticket.service.ts @@ -32,6 +32,8 @@ export class TicketService extends ShipperBaseService { $api_ficoVatinv_Detail = '/api/fcc/ficoVatinvL/getDetailByVatinvHId'; // 运营端订单明细开票处理 $api_apply_fico = '/api/fcc/ficoVatinvH/crmPushInvo'; + // 手工开票获取开票申请信息展示 + $api_get_apply_fico_info = '/api/fcc/ficoVatappH/get'; // 运营端手工开票/确认/E税云开票成功后的回调 $api_apply_fico_invoic = '/api/fcc/ficoVatinvH/operateAffirmVatinv'; // 运营端推送开票-E税云开票 From a16cff8d9bb290fa3734a302035d3cca5776e6ea Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 24 Mar 2022 17:33:40 +0800 Subject: [PATCH 41/99] fix bug --- .../components/vehicle/vehicle.component.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/routes/waybill-management/components/vehicle/vehicle.component.html b/src/app/routes/waybill-management/components/vehicle/vehicle.component.html index 4d7056af..7140b04e 100644 --- a/src/app/routes/waybill-management/components/vehicle/vehicle.component.html +++ b/src/app/routes/waybill-management/components/vehicle/vehicle.component.html @@ -1,7 +1,7 @@ @@ -20,7 +20,7 @@

-  确认已阅读并知晓 《变更协议》 +  确认已阅读并知晓 《变更协议》

diff --git a/src/app/routes/order-management/modal/vehicle/update-freight/update-freight.component.ts b/src/app/routes/order-management/modal/vehicle/update-freight/update-freight.component.ts index 82cd03ef..347247e1 100644 --- a/src/app/routes/order-management/modal/vehicle/update-freight/update-freight.component.ts +++ b/src/app/routes/order-management/modal/vehicle/update-freight/update-freight.component.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-15 13:17:42 * @LastEditors : Shiming - * @LastEditTime : 2022-02-23 14:25:45 + * @LastEditTime : 2022-03-24 19:17:10 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\update-freight\\update-freight.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -30,12 +30,16 @@ export class VehicleUpdateFreightComponent implements OnInit { @Input() data: any; + dataJSON: any; + calculateSub!: Subscription; constructor(private modal: NzModalRef, private msgSrv: NzMessageService, public service: OrderManagementService) {} ngOnInit(): void { console.log(this.data) + this.dataJSON = JSON.stringify(this.data) + console.log(this.dataJSON) this.initSF(this.data); } initSF(data: any) { diff --git a/src/app/routes/passport/components/order-agreement/order-agreement.component.ts b/src/app/routes/passport/components/order-agreement/order-agreement.component.ts index 1d8b0139..96ac222d 100644 --- a/src/app/routes/passport/components/order-agreement/order-agreement.component.ts +++ b/src/app/routes/passport/components/order-agreement/order-agreement.component.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-03-14 14:17:38 * @LastEditors : Shiming - * @LastEditTime : 2022-03-24 10:12:00 + * @LastEditTime : 2022-03-24 19:19:17 * @FilePath : \\tms-obc-web\\src\\app\\routes\\passport\\components\\order-agreement\\order-agreement.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -20,24 +20,31 @@ import { PassportService } from '../../services/passport.service'; export class OrderAgreementComponent implements OnInit { agreementContent: any; type = 2; + data : any; constructor(private ar: ActivatedRoute, private service: PassportService) { ar.queryParams.subscribe((params: Params) => { - this.type = params.type || 2; + console.log(params); + + this.type = params?.type || 2; + this.data = JSON.parse(params?.data) || {}; }); } ngOnInit() { console.log(this.type); if(this.type == 3) { - this.service.request(this.service.$api_get_getSupplementaryAgreement, { type: this.type }).subscribe(res => { + console.log(this.data); + + this.service.request(this.service.$api_get_getSupplementaryAgreement, { billId: this.data?.billId, billCode: this.data?.billCode }).subscribe(res => { + if (res) { + this.agreementContent = res; + } + }); + } else { + this.service.request(this.service.$api_get_agreement, { type: this.type }).subscribe(res => { if (res) { this.agreementContent = res; } }); } - this.service.request(this.service.$api_get_agreement, { type: this.type }).subscribe(res => { - if (res) { - this.agreementContent = res; - } - }); } } diff --git a/src/app/routes/supply-management/components/add-driver/add-driver.component.html b/src/app/routes/supply-management/components/add-driver/add-driver.component.html index 9483e3f5..e7df0e64 100644 --- a/src/app/routes/supply-management/components/add-driver/add-driver.component.html +++ b/src/app/routes/supply-management/components/add-driver/add-driver.component.html @@ -2,55 +2,61 @@ * @Description : * @Version : 1.0 * @Author : Shiming - * @Date : 2021-12-21 10:58:48 + * @Date : 2022-03-14 14:17:38 * @LastEditors : Shiming - * @LastEditTime : 2022-01-18 17:26:52 + * @LastEditTime : 2022-03-24 19:31:03 * @FilePath : \\tms-obc-web\\src\\app\\routes\\supply-management\\components\\add-driver\\add-driver.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> -
添加司机
+
- -
-
-
正面照
-
示例
-
-
-
- - -
-
-
背面照
-
示例
-
-
-
- + +
+
+
正面照
+
示例
+
+
+
+ + +
+
+
背面照
+
示例
+
+
+
+ + + + + + + + + + + - - - - + 查看示例 +
+ +
+
+
+ 查看示例 +
+ +
+
-->
- -
+ +
\ No newline at end of file diff --git a/src/app/routes/supply-management/components/add-driver/add-driver.component.ts b/src/app/routes/supply-management/components/add-driver/add-driver.component.ts index 76165473..95552850 100644 --- a/src/app/routes/supply-management/components/add-driver/add-driver.component.ts +++ b/src/app/routes/supply-management/components/add-driver/add-driver.component.ts @@ -4,11 +4,12 @@ import { cacheConf } from '@conf/cache.conf'; import { SFComponent, SFUISchema, SFSchema, SFUploadWidgetSchema, SFDateWidgetSchema } from '@delon/form'; import { _HttpClient } from '@delon/theme'; import { EACacheService, EAEnvironmentService } from '@shared'; +import { AnyRecord } from 'dns'; import { NzModalRef } from 'ng-zorro-antd/modal'; -import { Observable, Observer } from 'rxjs'; +import { NzUploadFile } from 'ng-zorro-antd/upload'; +import { Observable, Observer, of } from 'rxjs'; import { map } from 'rxjs/operators'; import { SupplyManagementService } from '../../services/supply-management.service'; - @Component({ selector: 'app-car-add-driver', templateUrl: './add-driver.component.html', @@ -21,6 +22,8 @@ export class CarAddDriverComponent implements OnInit { record: any = {}; i: any; ui: SFUISchema = {}; + ui2: SFUISchema = {}; + ui3: SFUISchema = {}; schema: SFSchema = {}; schema1: SFSchema = {}; schema2: SFSchema = {}; @@ -32,17 +35,18 @@ export class CarAddDriverComponent implements OnInit { userPracticeSeniorityDTO: {} }; companyData: any = {}; - mobile = ''; + mobile = '' + checked = false constructor( private modal: NzModalRef, public service: SupplyManagementService, private envSrv: EAEnvironmentService, - private eaCacheSrv: EACacheService - ) {} + private eaCacheSrv: EACacheService, + ) { } ngOnInit(): void { - this.companyData = this.eaCacheSrv.get(cacheConf.env); - this.initSF(); + this.companyData = this.eaCacheSrv.get(cacheConf.env) + this.initSF() } initSF() { this.schema = { @@ -51,36 +55,37 @@ export class CarAddDriverComponent implements OnInit { title: '司机信息(必填）', type: 'string', ui: { - widget: 'text' + widget: 'text', }, default: '照片上传后会自动识别文字并填充下列内容栏' }, mobile: { title: '手机号', type: 'string', - format: 'email', maxLength: 11, ui: { - widget: 'text' + widget: '', }, default: this.mobile }, showName: { title: '身份证照片', type: 'string', + readOnly: true, ui: { - widget: 'text', - showRequired: true + widget: 'textarea', + borderless:true, + showRequired: true, }, - default: '请上传身份证原件的高清照片，若上传复印件，则需加盖公司印章及法人签字；上传后系统会自动识别并填写' + default: '请上传身份证原件的高清照片，若上传复印件，则需加盖公司印章及法人签字；上传后系统会自动识别并填写', }, tipsA: { title: '', type: 'string', ui: { widget: 'custom', - offsetControl: 6 - } + offsetControl: 6, + }, }, certificatePhotoFrontWatermark: { type: 'string', @@ -88,7 +93,7 @@ export class CarAddDriverComponent implements OnInit { ui: { offsetControl: 6, action: apiConf.fileUpload, - fileType: 'image/png,image/jpeg,image/jpg,image/gif', + accept: 'image/png,image/jpeg,image/jpg,image/gif', limit: 1, limitFileCount: 1, resReName: 'data.fullFileWatermarkPath', @@ -96,18 +101,20 @@ export class CarAddDriverComponent implements OnInit { widget: 'upload', descriptionI18n: '图片支持jpg、jpeg、png、gif格式，大小不超过2M', data: { - appId: this.envSrv.env.appId + appId: this.envSrv.env.appId, }, name: 'multipartFile', multiple: false, listType: 'picture-card', - change: args => { + change: (args: any) => { if (args.type === 'success') { - this.detailData.certificatePhotoFront = args.file.response.data.fullFilePath; + this.detailData.certificatePhotoFront = args.file.response.data.fullFilePath this.checkIdCard(args.file.response.data.fullFilePath, 'front', 0); + } else { + this.detailData.certificatePhotoFront = '' } }, - beforeUpload: (file: any, _fileList) => { + beforeUpload: (file: any, _fileList: any) => { return new Observable((observer: Observer) => { const isLt2M = file.size / 1024 / 1024 < 2; if (!isLt2M) { @@ -118,16 +125,17 @@ export class CarAddDriverComponent implements OnInit { observer.next(isLt2M); observer.complete(); }); - } - } as SFUploadWidgetSchema + }, + previewFile: (file: NzUploadFile) => of(file.url), + }, }, tipsB: { title: '', type: 'string', ui: { widget: 'custom', - offsetControl: 6 - } + offsetControl: 6, + }, }, certificatePhotoBackWatermark: { type: 'string', @@ -135,7 +143,7 @@ export class CarAddDriverComponent implements OnInit { ui: { offsetControl: 6, action: apiConf.fileUpload, - fileType: 'image/png,image/jpeg,image/jpg,image/gif', + accept: 'image/png,image/jpeg,image/jpg,image/gif', limit: 1, limitFileCount: 1, resReName: 'data.fullFileWatermarkPath', @@ -143,18 +151,20 @@ export class CarAddDriverComponent implements OnInit { widget: 'upload', descriptionI18n: '图片支持jpg、jpeg、png、gif格式，大小不超过2M', data: { - appId: this.envSrv.env.appId + appId: this.envSrv.env.appId, }, name: 'multipartFile', multiple: false, listType: 'picture-card', - change: args => { + change: (args: any) => { if (args.type === 'success') { - this.detailData.certificatePhotoBack = args.file.response.data.fullFilePath; + this.detailData.certificatePhotoBack = args.file.response.data.fullFilePath this.checkIdCard(args.file.response.data.fullFilePath, 'back', 0); + } else { + this.detailData.certificatePhotoBack = '' } }, - beforeUpload: (file: any, _fileList) => { + beforeUpload: (file: any, _fileList: any) => { return new Observable((observer: Observer) => { const isLt2M = file.size / 1024 / 1024 < 2; if (!isLt2M) { @@ -165,8 +175,8 @@ export class CarAddDriverComponent implements OnInit { observer.next(isLt2M); observer.complete(); }); - } - } as SFUploadWidgetSchema + }, + previewFile: (file: NzUploadFile) => of(file.url),} }, name: { title: '姓名', @@ -174,8 +184,8 @@ export class CarAddDriverComponent implements OnInit { maxLength: 32, ui: { widget: '', - placeholder: '请输入姓名' - } + placeholder: '请输入姓名', + }, }, certificateNumber: { title: '身份证号', @@ -187,12 +197,17 @@ export class CarAddDriverComponent implements OnInit { widget: '', placeholder: '请输入法定代表人证件号', errors: { - required: '请输入18位身份证号码' - } - } - } + required: '请输入18位身份证号码', + }, + }, + }, }, - required: ['certificatePhotoFrontWatermark', 'certificatePhotoBackWatermark', 'name', 'certificateNumber'] + required: [ + 'certificatePhotoFrontWatermark', + 'certificatePhotoBackWatermark', + 'name', + 'certificateNumber' + ], }; this.schema1 = { properties: { @@ -200,7 +215,7 @@ export class CarAddDriverComponent implements OnInit { title: '驾驶证信息(必填）', type: 'string', ui: { - widget: 'text' + widget: 'text', }, default: '照片上传后会自动识别文字并填充下列内容栏' }, @@ -209,7 +224,7 @@ export class CarAddDriverComponent implements OnInit { title: '驾驶证照片', ui: { action: apiConf.fileUpload, - fileType: 'image/png,image/jpeg,image/jpg,image/gif', + accept: 'image/png,image/jpeg,image/jpg,image/gif', limit: 1, limitFileCount: 1, resReName: 'data.fullFileWatermarkPath', @@ -217,169 +232,80 @@ export class CarAddDriverComponent implements OnInit { widget: 'upload', descriptionI18n: '请上传驾驶证照片，支持JPG、PNG格式，文件小于5M。照片信息缺失、拼凑、过度PS、模糊不清，都不会通过审核。', data: { - appId: this.envSrv.env.appId + appId: this.envSrv.env.appId, }, name: 'multipartFile', multiple: false, listType: 'picture-card', - change: args => { + change: (args: any) => { if (args.type === 'success') { - this.detailData.userDriverLicenseDTO.certificatePhoto = args.file.response.data.fullFilePath; + this.detailData.userDriverLicenseDTO.certificatePhoto = args.file.response.data.fullFilePath this.checkDriverCard(args.file.response.data.fullFilePath, 'front', 0); + } else { + this.detailData.userDriverLicenseDTO.certificatePhoto = '' } }, - beforeUpload: (file: any, _fileList) => { + beforeUpload: (file: any, _fileList: any) => { return new Observable((observer: Observer) => { - const isLt4M = file.size / 1024 / 1024 < 4; + const isLt4M = file.size / 1024 / 1024 < 5; if (!isLt4M) { - this.service.msgSrv.warning('图片大小超过4M!'); + this.service.msgSrv.warning('图片大小超过5M!'); observer.complete(); return; } observer.next(isLt4M); observer.complete(); }); - } - } as SFUploadWidgetSchema + }, + previewFile: (file: NzUploadFile) => of(file.url),} + }, + roadImg: { + title: '', + type: 'boolean', + // enum: [{ label: '长期', value: true }], + ui: { + widget: 'custom', + } }, licenseNo: { title: '驾驶证号', type: 'string', ui: { - // widget: 'text', - placeholder: '请输入' - } + // widget: 'text', + placeholder: '请输入', + }, // default: this.ar.snapshot.queryParams.licenseNo }, driverModel: { title: '准驾车型', type: 'string', - enum: [ - { label: 'A1', value: 0 }, - { label: 'B1', value: 1 } - ], - ui: { - // widget: this.detailData.commitFlag !== 0 ? 'text' : '', - placeholder: '请输入' - } - }, - validStartTime: { - title: '法人证件有效开始日期', - type: 'string', - ui: { - widget: 'date', - format: 'yyyy-MM-dd', - placeholder: '请选择', - errors: { - required: '请选择起始日期' - }, - change: i => {} - } as SFDateWidgetSchema - }, - validEndTime: { - title: '法人证件有效开始日期', - type: 'string', - ui: { - widget: 'date', - format: 'yyyy-MM-dd', - placeholder: '请选择', - errors: { - required: '请选择起始日期' - }, - change: i => {} - } as SFDateWidgetSchema - }, - signingOrganization: { - title: '签发机关', - type: 'string', - maxLength: 30, - ui: { - // widget: this.detailData.commitFlag !== 0 ? 'text' : '', - placeholder: '请输入' - } - } - }, - required: ['certificatePhotoWatermark', 'licenseNo', 'driverModel', 'validStartTime', 'validEndTime'] - }; - this.schema2 = { - properties: { - titleC: { - title: '从业资格证(选填）', - type: 'string', - ui: { - widget: 'text' - }, - default: '照片上传后会自动识别文字并填充下列内容栏' - }, - certificatePhotoWatermark: { - type: 'string', - title: '', - ui: { - offsetControl: 6, - action: apiConf.fileUpload, - fileType: 'image/png,image/jpeg,image/jpg,image/gif', - limit: 1, - limitFileCount: 1, - resReName: 'data.fullFileWatermarkPath', - urlReName: 'data.fullFileWatermarkPath', - widget: 'upload', - descriptionI18n: '图片支持jpg、jpeg、png、gif格式，大小不超过5M', - data: { - appId: this.envSrv.env.appId - }, - name: 'multipartFile', - multiple: false, - listType: 'picture-card', - change: args => { - if (args.type === 'success') { - this.detailData.userPracticeSeniorityDTO.certificatePhoto = args.file.response.data.fullFilePath; - //this.checkIdCard(args.file.response.data.fullFile, 0, 0); - } - }, - beforeUpload: (file: any, _fileList) => { - return new Observable((observer: Observer) => { - const isLt2M = file.size / 1024 / 1024 < 2; - if (!isLt2M) { - this.service.msgSrv.warning('图片大小超过2M!'); - observer.complete(); - return; - } - observer.next(isLt2M); - observer.complete(); - }); - } - } as SFUploadWidgetSchema - }, - licenseNo: { - title: '从业资格证号', - type: 'string', - maxLength: 30, - ui: { - // widget: this.detailData.commitFlag !== 0 ? 'text' : '', - placeholder: '请输入' - } - }, - regionCode: { - title: '签发省份', - type: 'string', ui: { widget: 'select', - placeholder: '请选择', - asyncData: () => this.getProvinceData() - } as SFDateWidgetSchema + mode: 'multiple', + containsAllLabel: false, + placeholder: '请选择准驾车型', + asyncData: () => + this.service.request(this.service.$api_getDictValue, { dictKey: 'driverModel' }).pipe( + map((data: any) => { + return data.map((m: any) => { + return { label: m.label, value: m.label }; + }); + }), + ), + }, }, validStartTime: { - title: '发证日期', + title: '有效期起', type: 'string', ui: { widget: 'date', format: 'yyyy-MM-dd', placeholder: '请选择', errors: { - required: '请选择起始日期' + required: '请选择起始日期', }, - change: i => {} - } as SFDateWidgetSchema + change: (i) => { }, + } as SFDateWidgetSchema, }, validEndTime: { title: '有效期止', @@ -389,67 +315,210 @@ export class CarAddDriverComponent implements OnInit { format: 'yyyy-MM-dd', placeholder: '请选择', errors: { - required: '请选择起始日期' + required: '请选择终止日期', }, - change: i => {} - } as SFDateWidgetSchema - } + change: (i) => { }, + } as SFDateWidgetSchema, + }, + signingOrganization: { + title: '签发机关', + type: 'string', + maxLength: 30, + ui: { + // widget: this.detailData.commitFlag !== 0 ? 'text' : '', + placeholder: '请输入', + }, + }, }, - required: [] + required: [ + 'certificatePhotoWatermark', + 'licenseNo', + 'driverModel', + 'validStartTime', + 'validEndTime', + ], + }; + this.schema2 = { + properties: { + titleC: { + title: '从业资格证(选填）', + type: 'string', + ui: { + widget: 'text', + }, + default: '照片上传后会自动识别文字并填充下列内容栏', + }, + certificatePhotoWatermark: { + type: 'string', + title: '', + ui: { + offsetControl: 6, + action: apiConf.fileUpload, + accept: 'image/png,image/jpeg,image/jpg,image/gif', + limit: 1, + limitFileCount: 1, + resReName: 'data.fullFileWatermarkPath', + urlReName: 'data.fullFileWatermarkPath', + widget: 'upload', + descriptionI18n: '图片支持jpg、jpeg、png、gif格式，大小不超过5M', + data: { + appId: this.envSrv.env.appId, + }, + name: 'multipartFile', + multiple: false, + listType: 'picture-card', + change: (args: any) => { + if (args.type === 'success') { + this.detailData.userPracticeSeniorityDTO.certificatePhoto = args.file.response.data.fullFilePath + this.checkQualificationCertificate(args.file.response.data.fullFilePath); + } else{ + this.detailData.userPracticeSeniorityDTO.certificatePhoto = '' + } + }, + beforeUpload: (file: any, _fileList: any) => { + return new Observable((observer: Observer) => { + const isLt2M = file.size / 1024 / 1024 < 5; + if (!isLt2M) { + this.service.msgSrv.warning('图片大小超过5M!'); + observer.complete(); + return; + } + observer.next(isLt2M); + observer.complete(); + }); + }, + previewFile: (file: NzUploadFile) => of(file.url),} + }, + agreeImg: { + title: '', + type: 'boolean', + // enum: [{ label: '长期', value: true }], + ui: { + widget: 'custom', + } + }, + licenseNo: { + title: '从业资格证号', + type: 'string', + maxLength: 30, + ui: { + // widget: this.detailData.commitFlag !== 0 ? 'text' : '', + placeholder: '请输入', + }, + }, + regionCode: { + title: '签发省份', + type: 'string', + ui: { + widget: 'select', + placeholder: '请选择', + asyncData: () => this.getProvinceData(), + } as SFDateWidgetSchema, + }, + validStartTime: { + title: '发证日期', + type: 'string', + ui: { + widget: 'date', + format: 'yyyy-MM-dd', + placeholder: '请选择', + errors: { + required: '请选择起始日期', + }, + change: (i) => { }, + } as SFDateWidgetSchema, + }, + validEndTime: { + title: '有效期止', + type: 'string', + ui: { + widget: 'date', + format: 'yyyy-MM-dd', + placeholder: '请选择', + errors: { + required: '请选择终止日期', + }, + change: (i) => { }, + } as SFDateWidgetSchema, + }, + }, + required: [ + + ], }; this.ui = { '*': { spanLabelFixed: 180, grid: { span: 24 }, - width: 700 + width: 700, }, - $title1: { - spanLabelFixed: 0 - }, - $title2: { - spanLabelFixed: 0 - }, - $title3: { - spanLabelFixed: 0 - }, - $title4: { - spanLabelFixed: 0 - }, - $enterpriseRegistrationTime: { - width: 680 - }, - $operatingEndTime: { - grid: { span: 9 } - }, - $dateType: { - grid: { span: 4 } - }, - $validEndTime: { - grid: { span: 9 } - }, - $dateType01: { - grid: { span: 4 } - }, - $registrationCapital: { - grid: { span: 12 } - }, - $unit: { - spanLabelFixed: 20, - grid: { span: 3 } - } }; + this.ui2 = { + '*': { + spanLabelFixed: 180, + grid: { span: 18 }, + width: 600, + }, + $titleB:{ + grid: { span: 24 }, + }, + $certificatePhotoWatermark: { + grid: { span: 12 }, + }, + $roadImg: { + grid: { span: 4 }, + class: 'setCustom' + }, + }; + this.ui3 = { + '*': { + spanLabelFixed: 180, + grid: { span: 18 }, + width: 600, + }, + $titleC:{ + grid: { span: 24 }, + }, + $certificatePhotoWatermark: { + grid: { span: 12 }, + }, + $agreeImg: { + grid: { span: 4 }, + class: 'setCustom' + }, + }; + } + checkQualificationCertificate(imgurl: any) { + // 识别从业资格证 参数side：0-正面、1-背面；type：0-申请人身份证，1-法定代表人身份证 + const params = { + qualificationCertificateUrl: imgurl, + }; + this.service.request(this.service.$api_recognizeQualificationCertificate, params).subscribe((res: any) => { + if (res) { + this.sf2.setValue('/licenseNo', res.certificateNumber); + this.sf2.setValue('/regionCode', res.addressRegionCodes[0]); + res.qualificationCategoryList.forEach((item: any) => { + console.log(item.category.indexOf('道路货物运输驾驶员') !== -1) + if (item.category.indexOf('道路货物运输驾驶员') !== -1) { + this.sf2.setValue('/validStartTime', item.initialIssueDate.split(' ')[0]); + this.sf2.setValue('/validEndTime', item.expiryDate.split(' ')[0]); + } + }) + + } + }); } getProvinceData() { return this.service.request(this.service.$api_getRegionByCode, { regionCode: '' }).pipe( map((res: any) => { - const result: any = []; + const result: any = [] if (res) { res.map((m: any) => { - const item = { label: m.name, value: m.regionCode }; - result.push(item); + const item = { label: m.name, value: m.regionCode } + result.push(item) }); } - return result; + return result }) ); } @@ -457,9 +526,9 @@ export class CarAddDriverComponent implements OnInit { // 识别身份证 参数side：0-正面、1-背面；type：0-申请人身份证，1-法定代表人身份证 const params = { idCardUrl: imgurl, - side + side, }; - this.service.request(this.service.$api_checkIdCard, params).subscribe((res: any) => { + this.service.request(this.service.$api_checkIdCard, params).subscribe((res: any)=> { if (res) { if (type === 0) { // 法定代表人身份证 @@ -476,7 +545,7 @@ export class CarAddDriverComponent implements OnInit { // 识别身份证 参数side：0-正面、1-背面；type：0-申请人身份证，1-法定代表人身份证 const params = { driverLicenseUrl: imgurl, - side + side, }; this.service.request(this.service.$api_recognizeDriverLicense, params).subscribe((res: any) => { if (res) { @@ -485,7 +554,7 @@ export class CarAddDriverComponent implements OnInit { if (side === 'front') { // 正面 this.sf1.setValue('/licenseNo', res.number); - this.sf1.setValue('/driverModel', res.number); + this.sf1.setValue('/driverModel', [(res.classType).toUpperCase()]); this.sf1.setValue('/validStartTime', res.validFrom); this.sf1.setValue('/validEndTime', res.validTo); this.sf1.setValue('/signingOrganization', res.issuingAuthority); @@ -497,59 +566,51 @@ export class CarAddDriverComponent implements OnInit { close(): void { this.modal.destroy(); } - showExample() { - this.showCardFlag = !this.showCardFlag; + showExample(){ + this.showCardFlag = !this.showCardFlag } - showJopExample() { - this.showJopFlag = !this.showJopFlag; + showJopExample(){ + this.showJopFlag = !this.showJopFlag } - submitForm() { - const params: any = { - enterpriseId: this.companyData.enterpriseId, - enterpriseProjectId: this.companyData.projectId, + submitForm(){ + const params:any = { source: 1, - mobile: this.mobile, - identityInfoDTO: { + mobile: this.sf.value.mobile, + identityInfoDTO:{ ...this.sf.value, certificatePhotoFront: this.detailData.certificatePhotoFront, - certificatePhotoBack: this.detailData.certificatePhotoBack + certificatePhotoBack: this.detailData.certificatePhotoBack, }, userDriverLicenseDTO: { ...this.sf1.value, - certificatePhoto: this.detailData.userDriverLicenseDTO.certificatePhoto + certificatePhoto: this.detailData.userDriverLicenseDTO.certificatePhoto, }, userPracticeSeniorityDTO: { ...this.sf2.value, - certificatePhoto: this.detailData.userPracticeSeniorityDTO.certificatePhoto - } + certificatePhoto: this.detailData.userPracticeSeniorityDTO.certificatePhoto, + }, }; - Object.assign(params, { - identityInfoDTO: { - certificatePhotoFrontWatermark: this.sf?.value.certificatePhotoFrontWatermark, - certificatePhotoBackWatermark: this.sf?.value.certificatePhotoBackWatermark - }, - userDriverLicenseDTO: { - certificatePhotoWatermark: this.sf?.value.certificatePhotoWatermark - }, - userPracticeSeniorityDTO: { - certificatePhotoWatermark: this.sf?.value.certificatePhotoWatermark - } - }); - // params.identityInfoDTO.certificatePhotoFrontWatermark = this.sf?.value.certificatePhotoFrontWatermark; - // params.identityInfoDTO.certificatePhotoBackWatermark = this.sf?.value.certificatePhotoBackWatermark; - // params.userDriverLicenseDTO.certificatePhotoWatermark = this.sf1?.value.certificatePhotoWatermark; - // params.userPracticeSeniorityDTO.certificatePhotoWatermark = this.sf2?.value.certificatePhotoWatermark; + if(params.userPracticeSeniorityDTO.certificatePhoto === '' || params.userPracticeSeniorityDTO.certificatePhotoWatermark === '') { + delete params.userPracticeSeniorityDTO.certificatePhotoWatermark + delete params.userPracticeSeniorityDTO.certificatePhoto + } + params.userDriverLicenseDTO.driverModel = params.userDriverLicenseDTO.driverModel.join(',') + delete params.identityInfoDTO.showName; delete params.identityInfoDTO.titleA; - delete params.identityInfoDTO.titleB; - delete params.identityInfoDTO.titleC; + delete params.userDriverLicenseDTO.titleB; + delete params.userPracticeSeniorityDTO.titleC; delete params.userDriverLicenseDTO.tipsA; delete params.userPracticeSeniorityDTO.tipsC; - delete params.showName; + if(JSON.stringify(params.userPracticeSeniorityDTO) === '{}') { + params.userPracticeSeniorityDTO = null + } + this.checked = true this.service.request(this.service.$api_enterpriseVehicleSave, params).subscribe((res: any) => { - if (res) { - this.service.msgSrv.success('添加成功'); - this.modal.close(true); + this.checked = false + if(res){ + this.service.msgSrv.success('添加成功') + this.modal.close(true) } - }); + }) } } diff --git a/src/app/routes/supply-management/services/supply-management.service.ts b/src/app/routes/supply-management/services/supply-management.service.ts index 1a69f9cd..1d30559b 100644 --- a/src/app/routes/supply-management/services/supply-management.service.ts +++ b/src/app/routes/supply-management/services/supply-management.service.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-03 11:10:14 * @LastEditors : Shiming - * @LastEditTime : 2022-03-07 13:54:46 + * @LastEditTime : 2022-03-24 19:35:52 * @FilePath : \\tms-obc-web\\src\\app\\routes\\supply-management\\services\\supply-management.service.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -119,6 +119,8 @@ export class SupplyManagementService extends BaseService { public $api_getContractContent = '/api/sdc/contractTemplate/getContractContent'; // 获取运价 public $api_getFreight = '/api/mdc/cuc/freightConfig/getFreight'; + // 从业资格证 + $api_recognizeQualificationCertificate = '/api/mdc/pbc/hwc/ocr/recognizeQualificationCertificate'; /** * 获取车型、车长字典数据 * @returns From d3ec9d8eae5e38d952f5c63681c6a22dc0b85f09 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 24 Mar 2022 19:37:46 +0800 Subject: [PATCH 48/99] fix bug --- .../add-driver/add-driver.component.less | 68 ++++++++++++++----- 1 file changed, 50 insertions(+), 18 deletions(-) diff --git a/src/app/routes/supply-management/components/add-driver/add-driver.component.less b/src/app/routes/supply-management/components/add-driver/add-driver.component.less index 54338ad9..af8ad338 100644 --- a/src/app/routes/supply-management/components/add-driver/add-driver.component.less +++ b/src/app/routes/supply-management/components/add-driver/add-driver.component.less @@ -1,25 +1,57 @@ +.sfBox{ + position: relative; +} .pr { - position: relative; + position: relative; +} + +.pa { + position: absolute; + top: 35px; + left: 150px; + img{border: solid 1px #ebf0fb;} +} + +.tips { + display: flex; + margin-bottom: 0; + color: #333; + + dt { + width: 150px; } - .pa { - position: absolute; - top: 35px; - left: 150px; - } - - .tips { - display: flex; + dd { + width: 190px; margin-bottom: 0; - color: #333; - - dt { - width: 150px; + text-align: center; + } +} +.drivercard{ + position: absolute; + top: 620px; + left: 330px; + border: solid 1px #ebf0fb; +} +.jopcard{ + position: absolute; + top: 1034px; + left: 330px; + border: solid 1px #ebf0fb; +} +:host{ + ::ng-deep { + .ant-input-borderless{ + padding: 0; + padding-top: 4px; + color: black; + resize:none; } - - dd { - width: 190px; - margin-bottom: 0; - text-align: center; + .setCustom .ant-form-item-control{ + margin-left: -100px !important + } + .borderImg{ + border: solid 1px #ebf0fb; } } +} \ No newline at end of file From 894dc4365f369b0529c41edf061e269fc93ac1b7 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 24 Mar 2022 19:41:01 +0800 Subject: [PATCH 49/99] fix bug --- .../components/abnormal-appear/abnormal-appear.component.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/routes/waybill-management/components/abnormal-appear/abnormal-appear.component.html b/src/app/routes/waybill-management/components/abnormal-appear/abnormal-appear.component.html index a3cf1647..0b6288ab 100644 --- a/src/app/routes/waybill-management/components/abnormal-appear/abnormal-appear.component.html +++ b/src/app/routes/waybill-management/components/abnormal-appear/abnormal-appear.component.html @@ -1,7 +1,7 @@ @@ -65,13 +65,12 @@ [loading]="false" > - {{ item.billCode }} - {{ item.billCode }} + {{ item.billCode }}
{{ item?.representationsStatusLabel }}
- {{item?.billTypeLabel}}{{item?.serviceTypeLabel}} + {{item?.billTypeLabel}}{{item?.billTypeLabel === item?.serviceTypeLabel ? '' : item?.serviceTypeLabel}}
From a3c34fe7f73531515b63f3a516d29b00b9341558 Mon Sep 17 00:00:00 2001 From: Lingzi Date: Thu, 24 Mar 2022 20:46:15 +0800 Subject: [PATCH 51/99] fix bug --- .../components/freight/list/detail/detail.component.html | 9 +++++++++ .../components/freight/list/detail/detail.component.ts | 4 +++- .../components/freight/list/new/new.component.ts | 6 +++--- 3 files changed, 15 insertions(+), 4 deletions(-) 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 9e474055..63a9276a 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 @@ -355,6 +355,15 @@ + + 服务评级 + (暂无评级) + + + + + + 合伙人信息 diff --git a/src/app/routes/usercenter/components/freight/list/detail/detail.component.ts b/src/app/routes/usercenter/components/freight/list/detail/detail.component.ts index bbdf2dc3..cd82f249 100644 --- a/src/app/routes/usercenter/components/freight/list/detail/detail.component.ts +++ b/src/app/routes/usercenter/components/freight/list/detail/detail.component.ts @@ -34,7 +34,7 @@ export class FreightComponentsListDetailComponent implements OnInit, OnDestroy { ltdId: any = []; roles: any = []; customerServices: any = []; - + billEvaluateList: any = []; approvalOpinion = ''; networkTransporter = null; roleId = null; @@ -90,6 +90,7 @@ export class FreightComponentsListDetailComponent implements OnInit, OnDestroy { this.scrollTop = document.documentElement.scrollTop; }); } + /** * 初始化数据列表 */ @@ -202,6 +203,7 @@ export class FreightComponentsListDetailComponent implements OnInit, OnDestroy { this.service.request(this.service.$api_get_freight_billEvaluate, res).subscribe(billEvaluate => { if (billEvaluate) { this.billEvaluate = billEvaluate.totalScore; + this.billEvaluateList = res; } }); } diff --git a/src/app/routes/usercenter/components/freight/list/new/new.component.ts b/src/app/routes/usercenter/components/freight/list/new/new.component.ts index 9b1cbc6e..59359454 100644 --- a/src/app/routes/usercenter/components/freight/list/new/new.component.ts +++ b/src/app/routes/usercenter/components/freight/list/new/new.component.ts @@ -715,15 +715,15 @@ export class FreightComponentsListNewComponent implements OnInit { } }, promotersTelephone: { - title: '推广业务员手机号', + title: '邀请码', type: 'string', minLength: 1, format: 'mobile', maxLength: 11, ui: { grid: { xxl: 13, xl: 18, lg: 24, md: 24 }, - placeholder: '请输入推广业务员手机号', - errors: { required: '请输入推广业务员手机号', format: '手机号格式错误' } + placeholder: '请输入邀请码', + errors: { required: '请输入邀请码', format: '手机号格式错误' } } }, networkTransporter: { From d785fb4ef8166241a436288fbe903090e4eddf47 Mon Sep 17 00:00:00 2001 From: Lingzi Date: Thu, 24 Mar 2022 21:19:34 +0800 Subject: [PATCH 52/99] fix bug --- .../components/freight/list/detail/detail.component.html | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) 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 63a9276a..de3a37d1 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 @@ -367,16 +367,15 @@ 合伙人信息 - + {{partnerInfo.partnerEnterpriseName}} - + Date: Fri, 25 Mar 2022 10:53:41 +0800 Subject: [PATCH 53/99] fix bug --- src/app/routes/vehicle/components/audit/audit.component.ts | 7 ++++++- src/app/routes/vehicle/components/list/list.component.ts | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/app/routes/vehicle/components/audit/audit.component.ts b/src/app/routes/vehicle/components/audit/audit.component.ts index dcf50b10..931097ff 100644 --- a/src/app/routes/vehicle/components/audit/audit.component.ts +++ b/src/app/routes/vehicle/components/audit/audit.component.ts @@ -224,7 +224,12 @@ export class VehicleComponentsAuditComponent implements OnInit { } // 导出 exportFire() { - this.service.downloadFile(this.service.$api_carLicenseAudit_export, this.reqParams); + this.service.request(this.service.$api_carLicenseAudit_export, this.reqParams).subscribe((res: any) => { + if(res) { + this.service.msgSrv.success('导出成功！') + return + } + }); } addModal() { const i = { diff --git a/src/app/routes/vehicle/components/list/list.component.ts b/src/app/routes/vehicle/components/list/list.component.ts index ae822729..db5de664 100644 --- a/src/app/routes/vehicle/components/list/list.component.ts +++ b/src/app/routes/vehicle/components/list/list.component.ts @@ -283,6 +283,11 @@ export class VehicleComponentsListComponent implements OnInit { } // 导出 exportFire() { - this.service.downloadFile(this.service.$api_carLicense_export, this.reqParams); + this.service.request(this.service.$api_carLicense_export, this.reqParams).subscribe((res: any) => { + if(res) { + this.service.msgSrv.success('导出成功！') + return + } + }); } } From 99dddaac1e1258b733f7f41eb1280073e438ebf6 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 25 Mar 2022 11:03:04 +0800 Subject: [PATCH 54/99] fix bug --- .../components/receipts-audit/receipts-audit.component.html | 4 ++-- src/app/routes/vehicle/components/audit/audit.component.ts | 2 +- src/app/routes/vehicle/components/list/list.component.ts | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) 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 ff01551d..9a4d4bdb 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 @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-12 10:52:50 * @LastEditors : Shiming - * @LastEditTime : 2022-03-24 09:30:32 + * @LastEditTime : 2022-03-25 11:03:00 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\receipts-audit\\receipts-audit.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -130,7 +130,7 @@
- +
diff --git a/src/app/routes/vehicle/components/audit/audit.component.ts b/src/app/routes/vehicle/components/audit/audit.component.ts index 931097ff..cc18a6f5 100644 --- a/src/app/routes/vehicle/components/audit/audit.component.ts +++ b/src/app/routes/vehicle/components/audit/audit.component.ts @@ -226,7 +226,7 @@ export class VehicleComponentsAuditComponent implements OnInit { exportFire() { this.service.request(this.service.$api_carLicenseAudit_export, this.reqParams).subscribe((res: any) => { if(res) { - this.service.msgSrv.success('导出成功！') + this.service.msgSrv.success('导出成功,请去右上角下载中心下载') return } }); diff --git a/src/app/routes/vehicle/components/list/list.component.ts b/src/app/routes/vehicle/components/list/list.component.ts index db5de664..ead9468e 100644 --- a/src/app/routes/vehicle/components/list/list.component.ts +++ b/src/app/routes/vehicle/components/list/list.component.ts @@ -285,7 +285,7 @@ export class VehicleComponentsListComponent implements OnInit { exportFire() { this.service.request(this.service.$api_carLicense_export, this.reqParams).subscribe((res: any) => { if(res) { - this.service.msgSrv.success('导出成功！') + this.service.msgSrv.success('导出成功,请去右上角下载中心下载') return } }); From fe713e8c12433477d58f9f6f3ba5e9a75cc33e73 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 25 Mar 2022 13:19:53 +0800 Subject: [PATCH 55/99] fix bug --- .../components/receipts-audit/receipts-audit.component.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 9a4d4bdb..eb52e891 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 @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-12 10:52:50 * @LastEditors : Shiming - * @LastEditTime : 2022-03-25 11:03:00 + * @LastEditTime : 2022-03-25 13:18:34 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\receipts-audit\\receipts-audit.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -105,7 +105,7 @@ {{item?.billStatusLabel}}
- {{item?.resourceTypeLabel}}{{item?.serviceTypeLabel}} + {{item?.resourceTypeLabel}}{{item?.serviceTypeLabel === item?.resourceTypeLabel ? '':item?.serviceTypeLabel}}
From 81c42f2ceae8238759ecdd5bd04f0132d40b9496 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Fri, 25 Mar 2022 13:35:56 +0800 Subject: [PATCH 56/99] edit --- .../receivable-order.component.ts | 8 ++++---- .../withdrawals-detail.component.html | 2 +- .../withdrawals-detail.component.ts | 3 ++- .../withdrawals-record.component.ts | 2 +- .../services/freight-account.service.ts | 2 ++ .../dict-select/dict-select.component.ts | 16 +++++++--------- 6 files changed, 17 insertions(+), 16 deletions(-) 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 809ec0e7..3a740380 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 @@ -119,9 +119,9 @@ export class ReceivableOrderComponent implements OnInit { brmtype: { type: 'string', title: '收款类型', - enum: [{ value: '1', label: '费用款项' }], ui: { - widget: 'select', + widget: 'dict-select', + params: { dictKey: 'driverrecord:receive:type' }, placeholder: '请选择', visibleIf: { expand: (value: boolean) => value @@ -131,9 +131,9 @@ export class ReceivableOrderComponent implements OnInit { arvattype: { type: 'string', title: '付款类型', - enum: [{ value: '1', label: '费用款项' }], ui: { - widget: 'select', + widget: 'dict-select', + params: { dictKey: 'pay:type' }, placeholder: '请选择', visibleIf: { expand: (value: boolean) => value diff --git a/src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.html b/src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.html index cf8b7148..3ba4fb26 100644 --- a/src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.html +++ b/src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.html @@ -73,7 +73,7 @@
- diff --git a/src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.ts b/src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.ts index c63852e5..60812cec 100644 --- a/src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.ts +++ b/src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.ts @@ -33,11 +33,12 @@ export class WithdrawalsDetailComponent implements OnInit { ngOnInit(): void {} beforeReq = (requestOptions: STRequestOptions) => { - if (this.inputSF.value) { + if (this.inputSF?.value) { Object.assign(requestOptions.body, { ...this.inputSF.value }); } + Object.assign(requestOptions.body, { refundApplicationId: this.route.snapshot.params.id }); return requestOptions; }; diff --git a/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.ts b/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.ts index 5d58f9bc..42734ac9 100644 --- a/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.ts +++ b/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.ts @@ -254,7 +254,7 @@ export class WithdrawalsRecordComponent { { title: '提现单号', index: 'refundApplyCode', width: 120 }, { title: '网络货运人', index: 'ltdName', width: 140 }, { title: '银行类型', index: 'bankTypeLabel', width: 100 }, - { title: '账户类型', index: 'accountType', width: 100 }, + { title: '账户类型', index: 'accountTypeLabel', width: 100 }, { title: '账户名称', index: 'bankAccountName', width: 140 }, { title: '虚拟账户', index: 'virtualAccount', width: 100 }, { diff --git a/src/app/routes/financial-management/services/freight-account.service.ts b/src/app/routes/financial-management/services/freight-account.service.ts index 4cffd46f..65b1abe1 100644 --- a/src/app/routes/financial-management/services/freight-account.service.ts +++ b/src/app/routes/financial-management/services/freight-account.service.ts @@ -50,6 +50,8 @@ export class FreightAccountService extends ShipperBaseService { $api_get_refund_page = '/api/fcc/refundApplicationOBC/list/page'; // 获取提现申请表详情 $api_get_refund_detail = '/api/fcc/refundApplicationOBC/get'; + // 获取提现支付详情 + $api_get_refund_detail_page = '/api/fcc/refundApplicationOBC/get/payList'; // 同意提现 $api_agree_refund = '/api/fcc/refundApplicationOBC/agreeRefund'; // 拒绝提现 diff --git a/src/app/shared/components/dict-select/dict-select.component.ts b/src/app/shared/components/dict-select/dict-select.component.ts index 661bce83..4639fb0a 100644 --- a/src/app/shared/components/dict-select/dict-select.component.ts +++ b/src/app/shared/components/dict-select/dict-select.component.ts @@ -11,27 +11,25 @@ import { DictSelectService } from './dict-select.service'; { provide: NG_VALUE_ACCESSOR, useExisting: forwardRef(() => DictSelectComponent), - multi: true, - }, + multi: true + } ], - changeDetection: ChangeDetectionStrategy.OnPush, + changeDetection: ChangeDetectionStrategy.OnPush }) export class DictSelectComponent implements OnInit, ControlValueAccessor { - private onChangeFn?: (val: string) => void; private onTouchedFn?: () => void; defaultUrl = `/api/mdc/pbc/dictItems/getDictValue`; @Input() value: any = '' || []; // 默认选中值 @Input() url: string = ''; // 获取字典数据的地址 - @Input() params = {};// 请求参数 + @Input() params = {}; // 请求参数 dictList: any[] = []; @Input() containsAllLabel = true; // 是否包含全部这一选项 @Input() mode: 'multiple' | 'tags' | 'default' = 'default'; - - constructor(public service: DictSelectService, public cdr: ChangeDetectorRef) { } + constructor(public service: DictSelectService, public cdr: ChangeDetectorRef) {} writeValue(geo: string): void { if (geo == null) { @@ -55,9 +53,10 @@ export class DictSelectComponent implements OnInit, ControlValueAccessor { this.service.getDictList(this.url || this.defaultUrl, this.params).subscribe(res => { if (res) { this.dictList = res || []; - if (this.dictList.length > 0 && this.containsAllLabel) { + if (this.dictList.length > 0 && this.containsAllLabel !== false) { const obj = { label: '全部', value: '' }; this.dictList.unshift(obj); + console.log(this.dictList); } this.cdr.markForCheck(); } @@ -70,5 +69,4 @@ export class DictSelectComponent implements OnInit, ControlValueAccessor { isEmpty(val: any) { return val === undefined || val === null || val === ''; } - } From e4e72de99af3bd0013d49b1603988e0da1d01cc0 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Fri, 25 Mar 2022 13:39:41 +0800 Subject: [PATCH 57/99] edit --- .../receivable-order.component.ts | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) 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 3a740380..e4d01ea7 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 @@ -181,6 +181,23 @@ export class ReceivableOrderComponent implements OnInit { } } }, + bankType: { + type: 'string', + title: '银行类型', + enum: [ + { label: '全部', value: '' }, + { label: '平安银行', value: '1' }, + { label: '浦发银行', value: '2' } + ], + ui: { + widget: 'select', + placeholder: '请选择', + visibleIf: { + expand: (value: boolean) => value + } + }, + default: '' + }, ahxdate: { title: '核销日期', type: 'string', @@ -245,7 +262,6 @@ export class ReceivableOrderComponent implements OnInit { { title: '订单号', index: 'billHCode', type: 'link', width: 140 }, { title: '网络货运人', index: 'ltdName', width: 160 }, { title: '核销日期', index: 'ahxdate', type: 'date', width: 160 }, - { title: '付款账户', index: 'shipperaccount', width: 170 }, { title: '收款账户', index: 'ltdaccountId', width: 160 }, { title: '核销类型', index: 'ahxType', type: 'enum', enum: { '1': '预收款' }, width: 120 }, { @@ -265,6 +281,7 @@ export class ReceivableOrderComponent implements OnInit { { title: '银行类型', index: 'banktype', type: 'enum', enum: { '1': '平安', '2': '浦发' }, width: 120 }, { title: '收款类型', index: 'arvattype', type: 'enum', enum: { '1': '费用款项' }, width: 120 }, { title: '付款人', index: 'artoname', width: 200 }, + { title: '付款账户', index: 'shipperaccount', width: 170 }, { title: '结算客户', index: 'cnoName', width: 120 }, { title: '银行水单', index: 'bankreceipt', width: 200 }, { title: '创建时间', index: 'createTime', width: 180 }, From b042def28cf95cdf6db81c90229276bfa3d2e12a Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 25 Mar 2022 13:45:20 +0800 Subject: [PATCH 58/99] fix bug --- .../compliance-audit/compliance-audit.component.html | 5 +++-- .../components/receipts-audit/receipts-audit.component.html | 3 ++- src/app/routes/vehicle/components/list/list.component.ts | 6 +++--- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.html b/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.html index 34bd3f40..f08ba4b1 100644 --- a/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.html +++ b/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-12 10:52:50 * @LastEditors : Shiming - * @LastEditTime : 2022-03-24 09:48:40 + * @LastEditTime : 2022-03-25 13:44:42 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\compliance-audit\\compliance-audit.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -89,11 +89,12 @@ {{ item.billCode }} {{ item.billCode }} + {{ item.billCode }}
{{ item?.billStatusLabel }}
- {{item?.billTypeLabel}}{{item?.serviceTypeLabel}} + {{item?.billTypeLabel}}{{item?.serviceTypeLabel === item?.billTypeLabel ? '':item?.serviceTypeLabel}}
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 eb52e891..6fa93400 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 @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-12 10:52:50 * @LastEditors : Shiming - * @LastEditTime : 2022-03-25 13:18:34 + * @LastEditTime : 2022-03-25 13:44:11 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\receipts-audit\\receipts-audit.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -101,6 +101,7 @@ {{ item.billCode }} {{ item.billCode }} + {{ item.billCode }}
{{item?.billStatusLabel}}
diff --git a/src/app/routes/vehicle/components/list/list.component.ts b/src/app/routes/vehicle/components/list/list.component.ts index ead9468e..4a06a3a8 100644 --- a/src/app/routes/vehicle/components/list/list.component.ts +++ b/src/app/routes/vehicle/components/list/list.component.ts @@ -211,8 +211,8 @@ export class VehicleComponentsListComponent implements OnInit { false: { text: '空闲', color: 'default' } } }, - { title: '道运证', width: '150px', className: 'text-center', index: 'roadTransportNo' }, - { title: '审核人', width: '150px', className: 'text-center', index: 'approvalUserName' }, + // { title: '道运证', width: '150px', className: 'text-center', index: 'roadTransportNo' }, + // { title: '审核人', width: '150px', className: 'text-center', index: 'approvalUserName' }, { title: '行驶证到期状态', @@ -238,11 +238,11 @@ export class VehicleComponentsListComponent implements OnInit { 3: { text: '已到期', color: 'error' } } }, + { title: '是否入网', width: '200px', className: 'text-center', index: 'carOwner' }, { title: '所有人', width: '200px', className: 'text-center', index: 'carOwner' }, { title: '是否挂靠', width: '150px', className: 'text-center', render: 'isSelf' }, { title: '挂靠协议', width: '150px', className: 'text-center', render: 'approvalAuditStatus' }, // { title: '是否已备案', className: 'text-center', render: 'putOnRecord', }, - { title: '操作', fixed: 'right', From 24a87e913c9c65e4cd38266349d434f4d998c3aa Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 25 Mar 2022 13:57:30 +0800 Subject: [PATCH 59/99] fix bug --- .../order-agreement.component.html | 6 ++--- .../order-agreement.component.ts | 2 +- .../vehicle/components/list/list.component.ts | 27 ++++++++++++++++++- 3 files changed, 30 insertions(+), 5 deletions(-) diff --git a/src/app/routes/passport/components/order-agreement/order-agreement.component.html b/src/app/routes/passport/components/order-agreement/order-agreement.component.html index 89e01a91..a9106098 100644 --- a/src/app/routes/passport/components/order-agreement/order-agreement.component.html +++ b/src/app/routes/passport/components/order-agreement/order-agreement.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-27 21:08:36 * @LastEditors : Shiming - * @LastEditTime : 2022-02-24 10:50:46 + * @LastEditTime : 2022-03-25 13:56:06 * @FilePath : \\tms-obc-web\\src\\app\\routes\\passport\\components\\order-agreement\\order-agreement.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -13,7 +13,7 @@

{{ agreementContent?.agreementName }}

-

最新版本生效日期：{{ agreementContent?.modifyTime }}

-
+

最新版本生效日期：{{ agreementContent?.modifyTime }}

+
\ No newline at end of file diff --git a/src/app/routes/passport/components/order-agreement/order-agreement.component.ts b/src/app/routes/passport/components/order-agreement/order-agreement.component.ts index 96ac222d..5fa44cad 100644 --- a/src/app/routes/passport/components/order-agreement/order-agreement.component.ts +++ b/src/app/routes/passport/components/order-agreement/order-agreement.component.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-03-14 14:17:38 * @LastEditors : Shiming - * @LastEditTime : 2022-03-24 19:19:17 + * @LastEditTime : 2022-03-25 13:52:54 * @FilePath : \\tms-obc-web\\src\\app\\routes\\passport\\components\\order-agreement\\order-agreement.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ diff --git a/src/app/routes/vehicle/components/list/list.component.ts b/src/app/routes/vehicle/components/list/list.component.ts index 4a06a3a8..7f81c557 100644 --- a/src/app/routes/vehicle/components/list/list.component.ts +++ b/src/app/routes/vehicle/components/list/list.component.ts @@ -127,6 +127,15 @@ export class VehicleComponentsListComponent implements OnInit { } } }, + carLoad: { + title: '载重', + type: 'string', + ui: { + visibleIf: { + expand: (value: boolean) => value + } + } + }, isSelf: { type: 'string', title: '是否挂靠', @@ -174,7 +183,23 @@ export class VehicleComponentsListComponent implements OnInit { expand: (value: boolean) => value } } - } + }, + isSelfs: { + type: 'string', + title: '是否入网', + enum: [ + { label: '全部', value: '' }, + { label: '是', value: 1 }, + { label: '否', value: 0 } + ], + ui: { + widget: 'select', + allowClear: true, + visibleIf: { + expand: (value: boolean) => value + } + } + }, // putOnRecord: { // type: 'string', // title: '是否已备案', From 3935efb5ab9ba2f80896257203579d59f1c69d6b Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 25 Mar 2022 14:22:47 +0800 Subject: [PATCH 60/99] fix bug --- .../compliance-audit.component.ts | 20 ++- .../modal/audit/appeal/appeal.component.html | 7 + .../modal/audit/appeal/appeal.component.ts | 131 ++++++++++++++++++ .../order-management.module.ts | 6 +- .../components/audit/audit.component.ts | 2 +- 5 files changed, 162 insertions(+), 4 deletions(-) create mode 100644 src/app/routes/order-management/modal/audit/appeal/appeal.component.html create mode 100644 src/app/routes/order-management/modal/audit/appeal/appeal.component.ts diff --git a/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.ts b/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.ts index f4477ef8..8adef7ef 100644 --- a/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.ts +++ b/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.ts @@ -10,6 +10,7 @@ import { ConfirReceiptComponent } from '../../modal/bulk/confir-receipt/confir-r import { of } from 'rxjs'; import { ShipperBaseService } from '@shared'; import { Router } from '@angular/router'; +import { OneCarOrderAppealComponent } from '../../modal/audit/appeal/appeal.component'; @Component({ selector: 'app-order-management-compliance-audit', @@ -397,7 +398,7 @@ export class OrderManagementComplianceAuditComponent implements OnInit { buttons: [ { text: '查看申诉记录', - click: _record => console.log('1'), + click: _record => this.appeal(_record), // iif: item => item.billStatus == '5' }, { @@ -489,6 +490,23 @@ export class OrderManagementComplianceAuditComponent implements OnInit { get queryFieldCount(): number { return Object.keys(this.schema?.properties || {}).length; } + // 申诉记录 + appeal(item: any) { + const modalRef = this.modal.create({ + nzTitle: '申诉', + nzContent: OneCarOrderAppealComponent, + nzComponentParams: { + i: item + }, + nzFooter: null + }); + modalRef.afterClose.subscribe((res) => { + if(res){ + this.resetSF; + this.st.load(); + } + }); + } /** * 浮动费用查看 */ diff --git a/src/app/routes/order-management/modal/audit/appeal/appeal.component.html b/src/app/routes/order-management/modal/audit/appeal/appeal.component.html new file mode 100644 index 00000000..d3e53fd1 --- /dev/null +++ b/src/app/routes/order-management/modal/audit/appeal/appeal.component.html @@ -0,0 +1,7 @@ + + + +
+ + +
diff --git a/src/app/routes/order-management/modal/audit/appeal/appeal.component.ts b/src/app/routes/order-management/modal/audit/appeal/appeal.component.ts new file mode 100644 index 00000000..9a7eada4 --- /dev/null +++ b/src/app/routes/order-management/modal/audit/appeal/appeal.component.ts @@ -0,0 +1,131 @@ +import { Component, OnInit, ViewChild } from '@angular/core'; +import { apiConf } from '@conf/api.conf'; +import { + SFComponent, + SFCustomWidgetSchema, + SFNumberWidgetSchema, + SFRadioWidgetSchema, + SFSchema, + SFSelectWidgetSchema, + SFTextareaWidgetSchema, + SFUISchema, + SFUploadWidgetSchema +} from '@delon/form'; +import { _HttpClient } from '@delon/theme'; +import { NzMessageService } from 'ng-zorro-antd/message'; +import { NzModalRef, NzModalService } from 'ng-zorro-antd/modal'; +import { Observable, Observer } from 'rxjs'; +import { OrderManagementService } from '../../../services/order-management.service'; + +@Component({ + selector: 'app-order-management-appeal', + templateUrl: './appeal.component.html' +}) +export class OneCarOrderAppealComponent implements OnInit { + record: any = {}; + i: any; + @ViewChild('sf', { static: false }) sf!: SFComponent; + schema: SFSchema = {}; + ui: SFUISchema = {}; + constructor( + private modalRef: NzModalRef, + private modal: NzModalService, + private msgSrv: NzMessageService, + public http: _HttpClient, + public service: OrderManagementService + ) {} + + ngOnInit(): void { + this.initSF(); + } + initSF() { + this.schema = { + properties: { + abnormalCause: { + type: 'string', + title: '异常原因', + default: this.i.abnormalCause, + readOnly: true, + ui: { + widget: 'textarea', + autosize: { minRows: 4, maxRows: 6 } + } as SFTextareaWidgetSchema + }, + representationsCause: { + type: 'string', + title: '申诉原因', + ui: { + widget: 'dict-select', + params: { dictKey: 'bill:representation:reason' }, + containsAllLabel: false, + placeholder: '请选择', + errors: { required: '请选择' } + } + }, + representationsDescribe: { + type: 'string', + title: '申诉描述', + maxLength: 100, + ui: { + widget: 'textarea', + autosize: { minRows: 4, maxRows: 6 } + } as SFTextareaWidgetSchema + }, + fileArr: { + type: 'string', + title: '上传凭证', + ui: { + action: apiConf.fileUpload, + accept: 'image/png,image/jpeg,image/jpg', + limit: 5, + limitFileCount: 5, + resReName: 'data.fullFilePath', + urlReName: 'data.fullFilePath', + widget: 'upload', + descriptionI18n: '不超过5张，单张大小不超过5M，支持.jpg、.jpeg和 .png格式', + name: 'multipartFile', + multiple: true, + listType: 'picture-card', + beforeUpload: (file: any, _fileList: any) => { + return new Observable((observer: Observer) => { + const isLt2M = file.size / 1024 / 1024 < 5; + if (!isLt2M) { + this.service.msgSrv.warning('图片大小超过5M!'); + observer.complete(); + return; + } + observer.next(isLt2M); + observer.complete(); + }); + } + } as SFUploadWidgetSchema + } + }, + required: ['representationsCause', 'representationsDescribe'] + }; + this.ui = { + '*': { + spanLabelFixed: 100, + grid: { span: 20 } + } + }; + } + save(value: any): void { + // if (!this.sf.valid){ + // this.sf.validator({ emitError: true }); + // return; + // } + // this.service.request(this.service.$api_addCompleteVehicleRepresentations, { id: this.i?.id, ...this.sf.value }).subscribe(res => { + // if (res) { + // this.service.msgSrv.success('申诉成功！'); + // this.modalRef.close(true); + // } else { + // this.service.msgSrv.error(res.msg); + // } + // }); + } + + close(): void { + this.modalRef.destroy(); + } +} diff --git a/src/app/routes/order-management/order-management.module.ts b/src/app/routes/order-management/order-management.module.ts index b71b0fda..87ceaafd 100644 --- a/src/app/routes/order-management/order-management.module.ts +++ b/src/app/routes/order-management/order-management.module.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-06 09:24:00 * @LastEditors : Shiming - * @LastEditTime : 2022-02-22 13:55:06 + * @LastEditTime : 2022-03-25 14:10:36 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\order-management.module.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -24,6 +24,7 @@ import { OrderManagementVehicleDetailChangeComponent } from './components/vehicl import { OrderManagementVehicleDetailComponent } from './components/vehicle-detail/vehicle-detail.component'; import { OrderManagementVehicleComponent } from './components/vehicle/vehicle.component'; +import { OneCarOrderAppealComponent } from './modal/audit/appeal/appeal.component'; import { orderManagementVoucherViewComponent } from './modal/audit/voucher-view/voucher-view.component'; import { ConfirReceiptComponent } from './modal/bulk/confir-receipt/confir-receipt.component'; import { UpdateFreightComponent } from './modal/bulk/update-freight/update-freight.component'; @@ -64,7 +65,8 @@ const COMPONENTS: Type[] = [ orderManagementVoucherViewComponent, OrderManagementComplianceAuditComponent, OneCarOrderCancelConfirmComponent, - OneCarOrderViewtrackComponent + OneCarOrderViewtrackComponent, + OneCarOrderAppealComponent ]; @NgModule({ diff --git a/src/app/routes/vehicle/components/audit/audit.component.ts b/src/app/routes/vehicle/components/audit/audit.component.ts index cc18a6f5..047604d4 100644 --- a/src/app/routes/vehicle/components/audit/audit.component.ts +++ b/src/app/routes/vehicle/components/audit/audit.component.ts @@ -14,7 +14,7 @@ import { CarSettleCarauthComponent } from '../list/carauth/carauth.component'; }) export class VehicleComponentsAuditComponent implements OnInit { _$expand = false; - resourceStatus: any; + resourceStatus: any = 1; defaultTabs = 1; ui!: SFUISchema; schema!: SFSchema; From b4423eef37edd9d285d404fc81e3341f5bfc6020 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 25 Mar 2022 14:27:44 +0800 Subject: [PATCH 61/99] fix bug --- .../order-management/components/bulk/bulk.component.ts | 10 ++++++++++ .../components/vehicle/vehicle.component.ts | 7 +++++++ .../components/bulk/bulk.component.ts | 7 +++++++ .../components/vehicle/vehicle.component.ts | 7 +++++++ 4 files changed, 31 insertions(+) diff --git a/src/app/routes/order-management/components/bulk/bulk.component.ts b/src/app/routes/order-management/components/bulk/bulk.component.ts index b4b9f407..064ce130 100644 --- a/src/app/routes/order-management/components/bulk/bulk.component.ts +++ b/src/app/routes/order-management/components/bulk/bulk.component.ts @@ -186,6 +186,13 @@ export class OrderManagementBulkComponent implements OnInit { placeholder: '最多100个单号，空号隔开', } }, + wayBillCode: { + type: 'string', + title: '运单号', + ui: { + placeholder: '最多100个单号，空号隔开', + } + }, resourceCode: { type: 'string', title: '货源编号' @@ -199,6 +206,9 @@ export class OrderManagementBulkComponent implements OnInit { searchDebounceTime: 300, searchLoadingText: '搜索中...', allowClear: true, + visibleIf: { + _$expand: (value: boolean) => value + }, onSearch: (q: any) => { let str =q.replace(/^\s+|\s+$/g,""); if (str) { 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 33879e09..92a29c7c 100644 --- a/src/app/routes/order-management/components/vehicle/vehicle.component.ts +++ b/src/app/routes/order-management/components/vehicle/vehicle.component.ts @@ -203,6 +203,13 @@ export class OrderManagementVehicleComponent extends BasicTableComponent impleme placeholder: '最多100个单号，空号隔开' } }, + wayBillCode: { + type: 'string', + title: '运单号', + ui: { + placeholder: '最多100个单号，空号隔开', + } + }, resourceCode: { type: 'string', title: '货源编号' diff --git a/src/app/routes/waybill-management/components/bulk/bulk.component.ts b/src/app/routes/waybill-management/components/bulk/bulk.component.ts index 95320b9e..83dcd1f2 100644 --- a/src/app/routes/waybill-management/components/bulk/bulk.component.ts +++ b/src/app/routes/waybill-management/components/bulk/bulk.component.ts @@ -84,6 +84,13 @@ export class WaybillManagementBulkComponent implements OnInit { placeholder: '最多100个运单，空号隔开' } }, + billCode: { + type: 'string', + title: '订单号', + ui: { + placeholder: '最多100个单号，空号隔开' + } + }, resourceCode: { type: 'string', title: '货源编号' diff --git a/src/app/routes/waybill-management/components/vehicle/vehicle.component.ts b/src/app/routes/waybill-management/components/vehicle/vehicle.component.ts index 7e69667e..82410cf3 100644 --- a/src/app/routes/waybill-management/components/vehicle/vehicle.component.ts +++ b/src/app/routes/waybill-management/components/vehicle/vehicle.component.ts @@ -82,6 +82,13 @@ export class WaybillManagementVehicleComponent implements OnInit { placeholder: '最多100个运单，空号隔开' } }, + billCode: { + type: 'string', + title: '订单号', + ui: { + placeholder: '最多100个单号，空号隔开' + } + }, resourceCode: { type: 'string', title: '货源编号' From af6135f1ed5924ae43df557a4a25e3386d7d8fbd Mon Sep 17 00:00:00 2001 From: Lingzi Date: Fri, 25 Mar 2022 14:40:18 +0800 Subject: [PATCH 62/99] fix bug --- .../showService/showService.component.html | 10 ++--- .../list/showService/showservice.component.ts | 42 ++++++++----------- .../usercenter/services/usercenter.service.ts | 2 + 3 files changed, 23 insertions(+), 31 deletions(-) diff --git a/src/app/routes/usercenter/components/freight/list/showService/showService.component.html b/src/app/routes/usercenter/components/freight/list/showService/showService.component.html index 83ae084c..2c4deeca 100644 --- a/src/app/routes/usercenter/components/freight/list/showService/showService.component.html +++ b/src/app/routes/usercenter/components/freight/list/showService/showService.component.html @@ -1,16 +1,14 @@
-
客服人员
+
* 客服人员
- - - - + +
- +
\ No newline at end of file diff --git a/src/app/routes/usercenter/components/freight/list/showService/showservice.component.ts b/src/app/routes/usercenter/components/freight/list/showService/showservice.component.ts index f3e0ad5c..d0e4b01e 100644 --- a/src/app/routes/usercenter/components/freight/list/showService/showservice.component.ts +++ b/src/app/routes/usercenter/components/freight/list/showService/showservice.component.ts @@ -16,46 +16,38 @@ import { UsermanageService } from 'src/app/routes/usercenter/services/usercenter }) export class ShowServiceComponent implements OnInit { @ViewChild('sf', { static: false }) sf!: SFComponent; + appUserId = '' record: any = {}; i: any; - + serviceList: any = []; constructor( private modal: NzModalRef, public service: UsermanageService, - private envSrv: EAEnvironmentService, - private eaCacheSrv: EACacheService, ) { } ngOnInit(): void { - + this.initData() } close(): void { this.modal.close(true) } - +initData(){ + this.service.request(this.service.$api_getStaffList).subscribe(res => { + this.serviceList = res + }) +} submitForm(){ - // const params:any = { - // appUserId: this.i.appUserId, - // ...this.sf.value, - // bindType: this.i.bindType - // }; - // params.carFrontPhoto = this.detailData.carFrontPhoto - // params.carProtocal = this.detailData.carProtocal - // params.certificatePhotoFront = this.detailData.certificatePhotoFront - // params.certificatePhotoBack = this.detailData.certificatePhotoBack - // params.roadTransportPhoto = this.detailData.roadTransportPhoto - // delete params.titleA - // delete params.titleB - // this.checked = true - // this.service.request(this.service.$api_updateAssistCertification, params).subscribe(res => { - // this.checked = false - // if(res){ - // this.service.msgSrv.success('添加成功') - // this.modal.close(true) - // } - // }) + const params:any = { + appUserId: this.appUserId, + }; + this.service.request(this.service.$api_getStaffList, params).subscribe(res => { + if(res){ + this.service.msgSrv.success('分配成功') + this.modal.close(true) + } + }) } } diff --git a/src/app/routes/usercenter/services/usercenter.service.ts b/src/app/routes/usercenter/services/usercenter.service.ts index 07792f92..47557dbb 100644 --- a/src/app/routes/usercenter/services/usercenter.service.ts +++ b/src/app/routes/usercenter/services/usercenter.service.ts @@ -160,6 +160,8 @@ export class UsermanageService extends ShipperBaseService { $api_findEnterpriceChannelRelLog = '/api/mdc/enterpriceRelLog/findEnterpriceChannelRelLog'; // 查询企业合伙人渠道关系信息 $api_getEnterpriceRel = '/api/mdc/enterpriceRelLog/getEnterpriceRel'; + // 员工列表 + $api_getStaffList = '/api/mdc/cuc/userApp/getStaffList'; constructor(public injector: Injector, public nzModalService: NzModalService, private nzImageService: NzImageService) { super(injector); From ce615db5cca59b96069ad5feecc0f9717eef69a6 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Fri, 25 Mar 2022 14:51:42 +0800 Subject: [PATCH 63/99] edit --- .../invoice-requested.component.html | 22 ++-- .../invoice-requested.component.ts | 123 +++++++++++------- .../update-address-modal.component.html | 1 + .../update-address-modal.component.less | 0 .../update-address-modal.component.ts | 102 +++++++++++++++ .../services/ticket.service.ts | 7 + .../ticket-management.module.ts | 4 +- 7 files changed, 202 insertions(+), 57 deletions(-) create mode 100644 src/app/routes/ticket-management/components/invoice-requested/update-address-modal/update-address-modal.component.html create mode 100644 src/app/routes/ticket-management/components/invoice-requested/update-address-modal/update-address-modal.component.less create mode 100644 src/app/routes/ticket-management/components/invoice-requested/update-address-modal/update-address-modal.component.ts diff --git a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.html b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.html index 3790504f..fe0a8b6f 100644 --- a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.html +++ b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.html @@ -34,27 +34,30 @@ - + + -
+
已选择 {{ selectedRows.length }} 条数据   开票金额总计 {{ totalCallNo }} 清空
- - + + +
+ [page]="{}" [res]="{ process: afterRes }" [loading]="false" [scroll]="{ x: '1200px' }" (change)="stChange($event)"> {{ item.vatappcode }}
@@ -66,8 +69,9 @@
- +
- \ No newline at end of file + diff --git a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts index 4cf2df39..f1c5e073 100644 --- a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts +++ b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts @@ -12,6 +12,7 @@ import { NzModalService } from 'ng-zorro-antd/modal'; import { TicketService } from '../../services/ticket.service'; import { PrintOrderModalComponent } from './print-order-modal/print-order-modal.component'; import { RequestedInvoiceModalComponent } from './requested-invoice-modal/requested-invoice-modal.component'; +import { UpdateAddressModalComponent } from './update-address-modal/update-address-modal.component'; @Component({ selector: 'app-invoice-requested', @@ -33,12 +34,9 @@ export class InvoiceRequestedComponent { totalCallNo = 0; selectedRows: any[] = []; - constructor( - public service: TicketService, - private nzModalService: NzModalService, - private router: Router, - public shipperservice: ShipperBaseService - ) {} + + rejectReason = ''; + constructor(public service: TicketService, private nzModalService: NzModalService, private router: Router) {} beforeReq = (requestOptions: STRequestOptions) => { if (this.resourceStatus) { @@ -73,54 +71,84 @@ export class InvoiceRequestedComponent { } rejectAction(item: any[]) { + this.rejectReason = ''; + if (item.length <= 0) { + this.service.msgSrv.warning('请选择开票申请'); + return; + } + if (item.find(item => item.sts !== '1')) { + this.service.msgSrv.warning('请勿选择非待处理订单'); + return; + } const modal = this.nzModalService.create({ nzTitle: '驳回', nzContent: this.rejectModal, - nzFooter: [ - { - label: '拒绝', - type: 'default', - onClick: () => { - modal.destroy(); - } - }, - { - label: '通过', - type: 'primary', - onClick: () => { - modal.destroy(); - } + nzOkLoading: this.service.http.loading, + nzOnOk: () => { + if (!this.rejectReason) { + this.service.msgSrv.warning('请填写驳回原因'); + return false; } - ] + let ids = item.map(row => row.id); + this.service.request(this.service.$api_reject_invoice, ids).subscribe(res => { + if (res) { + this.service.msgSrv.success('驳回成功'); + modal.destroy(true); + } + }); + + return false; + } }); modal.afterClose.subscribe(res => { - this.st.load(); + if (res) { + this.st.load(); + } }); } - changePice(item: any[]) { + /** + * 修改地址 + * @param item + */ + changeAddress(item: any[]) { + this.rejectReason = ''; + if (item.length <= 0) { + this.service.msgSrv.warning('请选择开票申请'); + return; + } + if (item.find(item => item.sts !== '1')) { + this.service.msgSrv.warning('请勿选择非待处理订单'); + return; + } const modal = this.nzModalService.create({ - nzTitle: '驳回', - nzContent: this.rejectModal, - nzFooter: [ - { - label: '拒绝', - type: 'default', - onClick: () => { - modal.destroy(); - } - }, - { - label: '通过', - type: 'primary', - onClick: () => { - modal.destroy(); - } + nzTitle: '修改地址', + nzContent: UpdateAddressModalComponent, + nzOkLoading: this.service.http.loading, + nzOnOk: component => { + if (!component.sf.valid) { + this.service.msgSrv.warning('表单校验错误'); + return false; } - ] + this.service + .request(this.service.$api_update_invoice_address, { + ...component.sf.value, + + }) + .subscribe(res => { + if (res) { + this.service.msgSrv.success('修改成功'); + modal.destroy(true); + } + }); + + return false; + } }); modal.afterClose.subscribe(res => { - this.st.load(); + if (res) { + this.st.load(); + } }); } @@ -362,7 +390,7 @@ export class InvoiceRequestedComponent { visibleIf: { expand: (value: boolean) => value }, - asyncData: () => this.shipperservice.getCRM() + asyncData: () => this.service.getCRM() } } } @@ -440,14 +468,15 @@ export class InvoiceRequestedComponent { buttons: [ { type: 'divider' }, { - text: '开票
', + text: '开票受理
', click: item => this.requestedInvoiceAction(item), iif: item => item.sts === '1' }, - // { - // text: '驳回
', - // click: item => this.rejectAction([item]) - // }, + { + text: '驳回申请
', + click: item => this.rejectAction([item]), + iif: item => item.sts === '1' + }, { text: '订单明细
', click: item => this.router.navigate([`/ticket/invoice-requested/detail/${item?.id}`], { queryParams: { sts: item.sts } }) diff --git a/src/app/routes/ticket-management/components/invoice-requested/update-address-modal/update-address-modal.component.html b/src/app/routes/ticket-management/components/invoice-requested/update-address-modal/update-address-modal.component.html new file mode 100644 index 00000000..c31df344 --- /dev/null +++ b/src/app/routes/ticket-management/components/invoice-requested/update-address-modal/update-address-modal.component.html @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/app/routes/ticket-management/components/invoice-requested/update-address-modal/update-address-modal.component.less b/src/app/routes/ticket-management/components/invoice-requested/update-address-modal/update-address-modal.component.less new file mode 100644 index 00000000..e69de29b diff --git a/src/app/routes/ticket-management/components/invoice-requested/update-address-modal/update-address-modal.component.ts b/src/app/routes/ticket-management/components/invoice-requested/update-address-modal/update-address-modal.component.ts new file mode 100644 index 00000000..ce376d0b --- /dev/null +++ b/src/app/routes/ticket-management/components/invoice-requested/update-address-modal/update-address-modal.component.ts @@ -0,0 +1,102 @@ +import { Component, OnInit, ViewChild } from '@angular/core'; +import { SFCascaderWidgetSchema, SFComponent, SFSchema } from '@delon/form'; +import { TicketService } from '../../../services/ticket.service'; + +@Component({ + selector: 'app-update-address-modal', + templateUrl: './update-address-modal.component.html', + styleUrls: ['./update-address-modal.component.less'] +}) +export class UpdateAddressModalComponent implements OnInit { + @ViewChild('sf', { static: false }) + sf!: SFComponent; + schema: SFSchema = this.initSF(); + + constructor(public service: TicketService) {} + + ngOnInit(): void {} + + private initSF(): SFSchema { + return { + properties: { + reciname: { + type: 'string', + title: '收件人姓名', + ui: { + placeholder: '请输入' + } + }, + recitel: { + type: 'string', + title: '联系电话', + format: 'mobile', + minLength: 1, + maxLength: 11, + ui: { + placeholder: '请输入', + errors: { required: '请输入注册电话', format: '手机号格式错误' } + } + }, + provinceCode: { type: 'string', ui: { hidden: true } }, + provinceName: { type: 'string', ui: { hidden: true } }, + cityCode: { type: 'string', ui: { hidden: true } }, + cityName: { type: 'string', ui: { hidden: true } }, + areaCode: { type: 'string', ui: { hidden: true } }, + areaName: { type: 'string', ui: { hidden: true } }, + enterpriseAddressCode: { + type: 'number', + title: '收件人地区', + ui: { + grid: { xxl: 13, xl: 18, lg: 24, md: 24 }, + widget: 'cascader', + valueProperty: 'regionCode', + placeholder: '请选择', + labelProperty: 'name', + asyncData: (node: any, index: any) => { + return new Promise(resolve => { + this.getRegionDetailByCode(node?.regionCode || '').subscribe( + res => { + node.children = res.map((item: any) => ({ ...item, isLeaf: index === 1 })); + }, + _ => {}, + () => { + resolve(); + } + ); + }); + }, + selectionChange: (node: any[]) => { + console.log(node); + + if (node?.length > 0) { + this.sf.setValue('/provinceCode', node[0]?.regionCode); + this.sf.setValue('/provinceName', node[0]?.name); + this.sf.setValue('/cityCode', node[1]?.regionCode); + this.sf.setValue('/cityName', node[1]?.name); + this.sf.setValue('/areaCode', node[2]?.regionCode); + this.sf.setValue('/areaName', node[2]?.name); + } + } + } as SFCascaderWidgetSchema + }, + reciaddr: { + type: 'string', + title: '详细地址', + ui: { + visibleIf: { + expand: (value: boolean) => value + } + } + } + }, + required: ['reciname', 'recitel', 'reciaddr', 'enterpriseAddressCode'] + }; + } + + /* + * 根据地区code查询地区列表 + */ + getRegionDetailByCode(regionCode: any) { + return this.service.request(this.service.$api_get_region_by_code, { regionCode }); + } +} diff --git a/src/app/routes/ticket-management/services/ticket.service.ts b/src/app/routes/ticket-management/services/ticket.service.ts index a235412f..a3629120 100644 --- a/src/app/routes/ticket-management/services/ticket.service.ts +++ b/src/app/routes/ticket-management/services/ticket.service.ts @@ -23,6 +23,10 @@ export class TicketService extends ShipperBaseService { $api_get_invoice_requested_order_detail = '/api/fcc/ficoVatappBill/getDetailByVatapp'; // 删除开票申请订单明细 $api_remove_bill = '/api/fcc/ficoVatappBill/deletebatch'; + // 运营端单个/批量驳回 + $api_reject_invoice = '/api/fcc/ficoVatappH/rejectInvoiceApple'; + // 运营端修改开票地址 + $api_update_invoice_address = '/api/fcc/ficoVatappH/updateInvoiceAddr'; // 运营端销票处理-订单明细页面 $api_ficoVatinvHList = '/api/fcc/ficoVatinvH/ficoVatinvHList'; @@ -114,6 +118,9 @@ export class TicketService extends ShipperBaseService { $api_get_express_routes = '/api/fcc/ficoExpressH/searchRoutes'; // 下载对账单文件 $api_downloadPdf = '/api/fcc/ficoVatappBill/downloadPdf'; + + // 根据地区code查询列表 + $api_get_region_by_code = '/api/mdc/pbc/region/getRegionByCode'; constructor(public injector: Injector) { super(injector); diff --git a/src/app/routes/ticket-management/ticket-management.module.ts b/src/app/routes/ticket-management/ticket-management.module.ts index a00ba72a..e0d47e51 100644 --- a/src/app/routes/ticket-management/ticket-management.module.ts +++ b/src/app/routes/ticket-management/ticket-management.module.ts @@ -25,6 +25,7 @@ import { AddCostDetailComponent } from './components/input-invoice/add-cost-deta import { PrintOrderModalComponent } from './components/invoice-requested/print-order-modal/print-order-modal.component'; import { ExpressInfoComponent } from './components/express-info/express-info.component'; import { ExpressDetailModalComponent } from './components/express-info/express-detail-modal/express-detail-modal.component'; +import { UpdateAddressModalComponent } from './components/invoice-requested/update-address-modal/update-address-modal.component'; const COMPONENTS: any = [ ETCInvoicedListComponent, @@ -51,7 +52,8 @@ const NOTROUTECOMPONENTS: any = [ AddCollectionInvoiceModalComponent, AddCostDetailComponent, PrintOrderModalComponent, - ExpressDetailModalComponent + ExpressDetailModalComponent, + UpdateAddressModalComponent ]; @NgModule({ declarations: [...COMPONENTS, ...NOTROUTECOMPONENTS], From c60f909bc0726e62b119a3638f00dff5cc2e2887 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=98=E6=99=93=E4=BA=91?= Date: Fri, 25 Mar 2022 14:53:50 +0800 Subject: [PATCH 64/99] =?UTF-8?q?=E5=85=A5=E8=B4=A6=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E5=AF=B9=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/record/record.component.html | 13 +++++---- .../components/record/record.component.ts | 27 ++++++++++++++----- .../recorded/services/recorded.service.ts | 1 + 3 files changed, 30 insertions(+), 11 deletions(-) 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 2de32d76..ca550d9d 100644 --- a/src/app/routes/partner/recorded/components/record/record.component.html +++ b/src/app/routes/partner/recorded/components/record/record.component.html @@ -8,7 +8,7 @@
- +
diff --git a/src/app/routes/partner/recorded/components/record/record.component.ts b/src/app/routes/partner/recorded/components/record/record.component.ts index b6ac77e3..2a554c41 100644 --- a/src/app/routes/partner/recorded/components/record/record.component.ts +++ b/src/app/routes/partner/recorded/components/record/record.component.ts @@ -22,11 +22,11 @@ export class PartnerRecordedRecordComponent implements OnInit { columns!: STColumn[]; searchSchema!: SFSchema; totalInfo: any = { - partnerNum: 34, - count: 98, - invoiceAmount: 978239.98, - tax: 9878.00, - recorededAmount: 728698.98 + invoiceAmountSum: 0, + invoiceEntryNum: 0, + partnerNum: 0, + recordedAmountSum: 0, + taxPersonalSum: 0 } _$expand = false; @@ -306,7 +306,7 @@ export class PartnerRecordedRecordComponent implements OnInit { widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.amount }) } }, - { title: '提交时间', index: 'submitTime', width: 160, className: 'text-center' }, + { title: '提交时间', index: 'submitTime', width: 180, className: 'text-center' }, { title: '入账状态', index: 'stsLabel', width: 120, className: 'text-center' }, { title: '操作', @@ -345,4 +345,19 @@ export class PartnerRecordedRecordComponent implements OnInit { } }); } + + search() { + this.st.load(1); + this.getSummary(); + } + /** + * 底部统计 + */ + getSummary() { + this.service.request(this.service.$api_get_list_summary, { ...this.sf.value }).subscribe(res => { + if (res) { + this.totalInfo = res; + } + }) + } } diff --git a/src/app/routes/partner/recorded/services/recorded.service.ts b/src/app/routes/partner/recorded/services/recorded.service.ts index dcf5393f..72d088aa 100644 --- a/src/app/routes/partner/recorded/services/recorded.service.ts +++ b/src/app/routes/partner/recorded/services/recorded.service.ts @@ -11,6 +11,7 @@ export class RecordedService extends BaseService { $api_disagree_recorded = ``; // 拒绝审核 $api_agree_recorded = ``; // 同意审核 $api_audit_recored = `/api/bpc/partnerInvoiceEntry/oprationAudit`; // 审核单据 + $api_get_list_summary = `/api/bpc/partnerInvoiceEntry/invoiceEntrySummary`; // 每页统计 constructor(public injector: Injector) { super(injector); } From 4faecb7e94d71a95b531b509ea25536a418ebf3a Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 25 Mar 2022 14:56:06 +0800 Subject: [PATCH 65/99] fix bug --- .../routes/order-management/components/bulk/bulk.component.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/routes/order-management/components/bulk/bulk.component.ts b/src/app/routes/order-management/components/bulk/bulk.component.ts index 064ce130..6744da61 100644 --- a/src/app/routes/order-management/components/bulk/bulk.component.ts +++ b/src/app/routes/order-management/components/bulk/bulk.component.ts @@ -484,8 +484,8 @@ export class OrderManagementBulkComponent implements OnInit { width: '170px', className: 'text-left', format: (item: any) => - `${item.acceptWeight || '0'}吨/ - ${item.acceptVolume || '0'}方` + `${item.loadWeight || '0'}吨/ + ${item.loadVolume || '0'}方` }, { title: '结算数量', From a81d685b67c244d58ffa111bdbc8d81b7c999aaf Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Fri, 25 Mar 2022 14:58:53 +0800 Subject: [PATCH 66/99] edit --- .../components/freight/list/list.component.html | 9 +++++++++ .../usercenter/components/freight/list/list.component.ts | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) 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 e2504257..a6d0ea7c 100644 --- a/src/app/routes/usercenter/components/freight/list/list.component.html +++ b/src/app/routes/usercenter/components/freight/list/list.component.html @@ -39,6 +39,15 @@ + +
+ + + + +

暂无评价

+ +
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 3ddef9e3..a5c4f017 100644 --- a/src/app/routes/usercenter/components/freight/list/list.component.ts +++ b/src/app/routes/usercenter/components/freight/list/list.component.ts @@ -363,7 +363,7 @@ export class FreightComponentsListComponent implements OnInit { initST() { this.columns = [ // { title: '', type: 'checkbox', className: 'text-center' }, - { title: '企业名称', className: 'text-center', index: 'enterpriseName', width: 350 }, + { title: '企业名称', render: 'enterpriseName', width: 350 }, { title: '统一社会信用代码', className: 'text-center', render: 'unifiedSocialCreditCode', width: 200 }, { title: '公司所在地', From 54127209303ad8c7ed96f4acee0074d7d96f2159 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Fri, 25 Mar 2022 15:01:39 +0800 Subject: [PATCH 67/99] edit --- .../receivable-order.component.ts | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) 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 e4d01ea7..590aa5fe 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 @@ -230,16 +230,16 @@ export class ReceivableOrderComponent implements OnInit { } } }, - orderS3: { - type: 'string', - title: '费用号', - ui: { - placeholder: '请输入', - visibleIf: { - expand: (value: boolean) => value - } - } - }, + // orderS3: { + // type: 'string', + // title: '费用号', + // ui: { + // placeholder: '请输入', + // visibleIf: { + // expand: (value: boolean) => value + // } + // } + // }, remarks: { type: 'string', title: '核销备注', From 670543f8cf893a4c463a8d770e85383b2bac0eac Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 25 Mar 2022 15:04:50 +0800 Subject: [PATCH 68/99] fix bug --- .../components/compliance-audit/compliance-audit.component.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.ts b/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.ts index 8adef7ef..26b95ccb 100644 --- a/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.ts +++ b/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.ts @@ -121,7 +121,6 @@ export class OrderManagementComplianceAuditComponent implements OnInit { this.initST(); setTimeout(() => { this.st.load(); - this.getGoodsSourceStatistical(); }, 500); } ngOnInit(): void { From 9a0c58504cee1842c0bd86a7fe81eb0e105023bc Mon Sep 17 00:00:00 2001 From: Lingzi Date: Fri, 25 Mar 2022 15:22:32 +0800 Subject: [PATCH 69/99] fix bug --- .../showService/showService.component.html | 13 +-- .../list/showService/showservice.component.ts | 85 ++++++++++++++----- .../usercenter/services/usercenter.service.ts | 2 + 3 files changed, 66 insertions(+), 34 deletions(-) diff --git a/src/app/routes/usercenter/components/freight/list/showService/showService.component.html b/src/app/routes/usercenter/components/freight/list/showService/showService.component.html index 2c4deeca..82ea63f2 100644 --- a/src/app/routes/usercenter/components/freight/list/showService/showService.component.html +++ b/src/app/routes/usercenter/components/freight/list/showService/showService.component.html @@ -1,14 +1,5 @@ - - -
-
* 客服人员
-
- - - -
-
+
- +
\ No newline at end of file diff --git a/src/app/routes/usercenter/components/freight/list/showService/showservice.component.ts b/src/app/routes/usercenter/components/freight/list/showService/showservice.component.ts index d0e4b01e..107bdbd2 100644 --- a/src/app/routes/usercenter/components/freight/list/showService/showservice.component.ts +++ b/src/app/routes/usercenter/components/freight/list/showService/showservice.component.ts @@ -1,12 +1,13 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { apiConf } from '@conf/api.conf'; import { cacheConf } from '@conf/cache.conf'; -import { SFUISchema, SFSchema, SFUploadWidgetSchema, SFComponent, SFSelectWidgetSchema } from '@delon/form'; +import { SFUISchema, SFSchema, SFUploadWidgetSchema, SFComponent, SFSelectWidgetSchema, SFSchemaEnum } from '@delon/form'; import { _HttpClient } from '@delon/theme'; import { EACacheService, EAEnvironmentService } from '@shared'; import { NzModalRef } from 'ng-zorro-antd/modal'; import { NzUploadFile } from 'ng-zorro-antd/upload'; import { Observable, Observer, of } from 'rxjs'; +import { map } from 'rxjs/operators'; import { UsermanageService } from 'src/app/routes/usercenter/services/usercenter.service'; @Component({ @@ -19,7 +20,8 @@ export class ShowServiceComponent implements OnInit { appUserId = '' record: any = {}; i: any; - serviceList: any = []; + ui!: SFUISchema; + schema!: SFSchema; constructor( private modal: NzModalRef, @@ -27,27 +29,64 @@ export class ShowServiceComponent implements OnInit { ) { } ngOnInit(): void { - this.initData() + this.initSF() } - -close(): void { - this.modal.close(true) -} -initData(){ - this.service.request(this.service.$api_getStaffList).subscribe(res => { - this.serviceList = res - }) -} -submitForm(){ - const params:any = { - appUserId: this.appUserId, - }; - this.service.request(this.service.$api_getStaffList, params).subscribe(res => { - if(res){ - this.service.msgSrv.success('分配成功') - this.modal.close(true) - } - }) -} + initSF() { + this.schema = { + properties: { + _$expand: { type: 'boolean', ui: { hidden: true } }, + customerServiceId: { + title: '客服人员', + type: 'string', + ui: { + widget: 'select', + asyncData: () => { + const params = { + // enterpriseId: 1, + // enterpriseProjectId: this.i.mainProjectId, + } + return this.service.request(this.service.$api_getStaffList, params).pipe( + map((res: any) => { + return res.map((i: any) => { + return { label: i.name, value: i.appUserId }; + }); + }), + ); + // serverSearch: true, + // searchDebounceTime: 300, + // searchLoadingText: '搜索中...', + // onSearch: (q: any) => { + // if (!!q) { + // return this.service + // .request(this.service.$api_getStaffList, { + // nameOrPhone: q + // }) + // .pipe(map((res: any) => (res?.records as any[]).map(i => ({ name: i.name, value: i.appUserId } as SFSchemaEnum)))) + // .toPromise(); + // } else { + // return of([]); + // } + }, + } as SFSelectWidgetSchema + } + }, + required: ['customerServiceId'] + }; + } + close(): void { + this.modal.close(true) + } + submitForm() { + const params: any = { + ...this.sf.value, + enterpriseIdList: [this.i.id] + }; + this.service.request(this.service.$api_distributionCusService, params).subscribe(res => { + if (res) { + this.service.msgSrv.success('分配成功') + this.modal.close(true) + } + }) + } } diff --git a/src/app/routes/usercenter/services/usercenter.service.ts b/src/app/routes/usercenter/services/usercenter.service.ts index 47557dbb..6bd733d5 100644 --- a/src/app/routes/usercenter/services/usercenter.service.ts +++ b/src/app/routes/usercenter/services/usercenter.service.ts @@ -162,6 +162,8 @@ export class UsermanageService extends ShipperBaseService { $api_getEnterpriceRel = '/api/mdc/enterpriceRelLog/getEnterpriceRel'; // 员工列表 $api_getStaffList = '/api/mdc/cuc/userApp/getStaffList'; + // 分配客服人员 + $api_distributionCusService = '/api/mdc/cuc/enterpriseInfo/operate/distributionCusService'; constructor(public injector: Injector, public nzModalService: NzModalService, private nzImageService: NzImageService) { super(injector); From 0cbc13389f01df19622c6ac645b9914e17390a43 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 25 Mar 2022 15:59:31 +0800 Subject: [PATCH 70/99] fix bug --- .../modal/audit/appeal/appeal.component.html | 47 ++++- .../modal/audit/appeal/appeal.component.ts | 170 +++++++++--------- .../services/order-management.service.ts | 4 +- .../imagelist/imagelist.component.html | 12 +- .../imagelist/imagelist.component.ts | 17 +- 5 files changed, 151 insertions(+), 99 deletions(-) diff --git a/src/app/routes/order-management/modal/audit/appeal/appeal.component.html b/src/app/routes/order-management/modal/audit/appeal/appeal.component.html index d3e53fd1..6e717730 100644 --- a/src/app/routes/order-management/modal/audit/appeal/appeal.component.html +++ b/src/app/routes/order-management/modal/audit/appeal/appeal.component.html @@ -1,7 +1,48 @@ + - - +
+ + + {{ dataList?.representationsStatusLabel }} + + +
+
+ {{ item?.complianceName }} +
+
+ + + {{ dataList?.representationsCause }} + + + {{ dataList?.representationsDescribe }} + + +
+ + +
+ + +
-
diff --git a/src/app/routes/order-management/modal/audit/appeal/appeal.component.ts b/src/app/routes/order-management/modal/audit/appeal/appeal.component.ts index 9a7eada4..451a3796 100644 --- a/src/app/routes/order-management/modal/audit/appeal/appeal.component.ts +++ b/src/app/routes/order-management/modal/audit/appeal/appeal.component.ts @@ -22,11 +22,8 @@ import { OrderManagementService } from '../../../services/order-management.servi templateUrl: './appeal.component.html' }) export class OneCarOrderAppealComponent implements OnInit { - record: any = {}; i: any; - @ViewChild('sf', { static: false }) sf!: SFComponent; - schema: SFSchema = {}; - ui: SFUISchema = {}; + dataList: any; constructor( private modalRef: NzModalRef, private modal: NzModalService, @@ -36,93 +33,88 @@ export class OneCarOrderAppealComponent implements OnInit { ) {} ngOnInit(): void { - this.initSF(); + this.initDate(); } - initSF() { - this.schema = { - properties: { - abnormalCause: { - type: 'string', - title: '异常原因', - default: this.i.abnormalCause, - readOnly: true, - ui: { - widget: 'textarea', - autosize: { minRows: 4, maxRows: 6 } - } as SFTextareaWidgetSchema - }, - representationsCause: { - type: 'string', - title: '申诉原因', - ui: { - widget: 'dict-select', - params: { dictKey: 'bill:representation:reason' }, - containsAllLabel: false, - placeholder: '请选择', - errors: { required: '请选择' } - } - }, - representationsDescribe: { - type: 'string', - title: '申诉描述', - maxLength: 100, - ui: { - widget: 'textarea', - autosize: { minRows: 4, maxRows: 6 } - } as SFTextareaWidgetSchema - }, - fileArr: { - type: 'string', - title: '上传凭证', - ui: { - action: apiConf.fileUpload, - accept: 'image/png,image/jpeg,image/jpg', - limit: 5, - limitFileCount: 5, - resReName: 'data.fullFilePath', - urlReName: 'data.fullFilePath', - widget: 'upload', - descriptionI18n: '不超过5张，单张大小不超过5M，支持.jpg、.jpeg和 .png格式', - name: 'multipartFile', - multiple: true, - listType: 'picture-card', - beforeUpload: (file: any, _fileList: any) => { - return new Observable((observer: Observer) => { - const isLt2M = file.size / 1024 / 1024 < 5; - if (!isLt2M) { - this.service.msgSrv.warning('图片大小超过5M!'); - observer.complete(); - return; - } - observer.next(isLt2M); - observer.complete(); - }); - } - } as SFUploadWidgetSchema - } - }, - required: ['representationsCause', 'representationsDescribe'] - }; - this.ui = { - '*': { - spanLabelFixed: 100, - grid: { span: 20 } + // initSF() { + // this.schema = { + // properties: { + // abnormalCause: { + // type: 'string', + // title: '异常原因', + // default: this.i.abnormalCause, + // readOnly: true, + // ui: { + // widget: 'textarea', + // autosize: { minRows: 4, maxRows: 6 } + // } as SFTextareaWidgetSchema + // }, + // representationsCause: { + // type: 'string', + // title: '申诉原因', + // ui: { + // widget: 'dict-select', + // params: { dictKey: 'bill:representation:reason' }, + // containsAllLabel: false, + // placeholder: '请选择', + // errors: { required: '请选择' } + // } + // }, + // representationsDescribe: { + // type: 'string', + // title: '申诉描述', + // maxLength: 100, + // ui: { + // widget: 'textarea', + // autosize: { minRows: 4, maxRows: 6 } + // } as SFTextareaWidgetSchema + // }, + // fileArr: { + // type: 'string', + // title: '上传凭证', + // ui: { + // action: apiConf.fileUpload, + // accept: 'image/png,image/jpeg,image/jpg', + // limit: 5, + // limitFileCount: 5, + // resReName: 'data.fullFilePath', + // urlReName: 'data.fullFilePath', + // widget: 'upload', + // descriptionI18n: '不超过5张，单张大小不超过5M，支持.jpg、.jpeg和 .png格式', + // name: 'multipartFile', + // multiple: true, + // listType: 'picture-card', + // beforeUpload: (file: any, _fileList: any) => { + // return new Observable((observer: Observer) => { + // const isLt2M = file.size / 1024 / 1024 < 5; + // if (!isLt2M) { + // this.service.msgSrv.warning('图片大小超过5M!'); + // observer.complete(); + // return; + // } + // observer.next(isLt2M); + // observer.complete(); + // }); + // } + // } as SFUploadWidgetSchema + // } + // }, + // required: ['representationsCause', 'representationsDescribe'] + // }; + // this.ui = { + // '*': { + // spanLabelFixed: 100, + // grid: { span: 20 } + // } + // }; + // } + initDate(): void { + console.log(this.i); + this.service.request(this.service.$api_get_getOrderComplaintDetail, { id: this.i?.id }).subscribe((res: any) => { + if (res) { + console.log(res); + this.dataList = res } - }; - } - save(value: any): void { - // if (!this.sf.valid){ - // this.sf.validator({ emitError: true }); - // return; - // } - // this.service.request(this.service.$api_addCompleteVehicleRepresentations, { id: this.i?.id, ...this.sf.value }).subscribe(res => { - // if (res) { - // this.service.msgSrv.success('申诉成功！'); - // this.modalRef.close(true); - // } else { - // this.service.msgSrv.error(res.msg); - // } - // }); + }); } close(): void { diff --git a/src/app/routes/order-management/services/order-management.service.ts b/src/app/routes/order-management/services/order-management.service.ts index 68e977d5..0292cef2 100644 --- a/src/app/routes/order-management/services/order-management.service.ts +++ b/src/app/routes/order-management/services/order-management.service.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-03 15:31:52 * @LastEditors : Shiming - * @LastEditTime : 2022-03-22 17:29:07 + * @LastEditTime : 2022-03-25 15:27:40 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\services\\order-management.service.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -174,6 +174,8 @@ export class OrderManagementService extends ShipperBaseService { $api_get_getTrajectory = `/api/sdc/billShipper/getTrajectoryByBillId`; // 获取订单司机轨迹 $api_get_getAppDriverPosition = `/api/sdc/billShipper/getAppDriverPosition`; + // 查看申述记录 + $api_get_getOrderComplaintDetail = `/api/sdc/billOperate/getOrderComplaintDetail`; /** * 根据企业ID，获取企业历史网络货运人 * @returns diff --git a/src/app/shared/components/imagelist/imagelist.component.html b/src/app/shared/components/imagelist/imagelist.component.html index 3936f667..10a80404 100644 --- a/src/app/shared/components/imagelist/imagelist.component.html +++ b/src/app/shared/components/imagelist/imagelist.component.html @@ -1,6 +1,16 @@ +
- + diff --git a/src/app/shared/components/imagelist/imagelist.component.ts b/src/app/shared/components/imagelist/imagelist.component.ts index 40bb7f37..6fba4fd0 100644 --- a/src/app/shared/components/imagelist/imagelist.component.ts +++ b/src/app/shared/components/imagelist/imagelist.component.ts @@ -1,10 +1,10 @@ /* * @Author: your name * @Date: 2021-12-09 17:36:13 - * @LastEditTime: 2021-12-10 14:12:24 - * @LastEditors: Please set LastEditors + * @LastEditTime : 2022-03-25 15:43:12 + * @LastEditors : Shiming * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE - * @FilePath: \tms-obc-web\src\app\shared\components\imagelist\imagelist.component.ts + * @FilePath : \\tms-obc-web\\src\\app\\shared\\components\\imagelist\\imagelist.component.ts */ import { Component, Input, OnInit } from '@angular/core'; import { ModalHelper, _HttpClient } from '@delon/theme'; @@ -26,13 +26,20 @@ export class ImageListComponent implements OnInit { private nzImageService: NzImageService ) {} - ngOnInit(): void {} + ngOnInit(): void { + + } showImg(index: any) { const params = { imgList: this.imgList, index }; - const images = this.imgList.map((url: string) => ({ src: url })); + const images = this.imgList.map((url: string) => { + if(url) { + console.log(url); + ({ src: url }) + } + }); this.nzImageService.preview(images); // this.modal.create(ImageViewComponent, { params }).subscribe(res => {}); } From 5b95e6416f367e4e0399182c893b75c4bc7cd087 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Fri, 25 Mar 2022 16:01:23 +0800 Subject: [PATCH 71/99] edit --- proxy.conf.js | 2 +- .../freight-account.component.ts | 2 +- .../services/freight-account.service.ts | 2 + .../index/partner-list.component.html | 5 +- .../index/partner-list.component.less | 0 .../index/partner-list.component.ts | 46 +++++++++++++------ .../partner-audit-modal.component.ts | 10 ++-- .../partner-detail.component.html | 20 ++++---- .../partner-detail.component.ts | 12 ++--- .../personal-partner-detail.component.ts | 5 +- .../services/partner-list.service.ts | 6 ++- .../services/business/shipper-base.service.ts | 4 +- 12 files changed, 72 insertions(+), 42 deletions(-) delete mode 100644 src/app/routes/partner/partner-list/components/index/partner-list.component.less diff --git a/proxy.conf.js b/proxy.conf.js index 67c15ee2..10071e14 100644 --- a/proxy.conf.js +++ b/proxy.conf.js @@ -20,7 +20,7 @@ module.exports = { // } '//api': { target: { - host: 'tms-api-test.eascs.com', + host: 'tms-api-dev.eascs.com', protocol: 'https:', port: 443 }, diff --git a/src/app/routes/financial-management/components/freight-account/freight-account.component.ts b/src/app/routes/financial-management/components/freight-account/freight-account.component.ts index 2309923a..610f1efe 100644 --- a/src/app/routes/financial-management/components/freight-account/freight-account.component.ts +++ b/src/app/routes/financial-management/components/freight-account/freight-account.component.ts @@ -80,7 +80,7 @@ export class FreightAccountComponent implements OnInit { } exportList() { - this.service.downloadFile(this.service.$mock_url, { ...this.sf.value, pageSize: -1 }); + this.service.asyncExport({ ...this.sf.value, pageSize: -1 }, this.service.$api_export_shipper); } private initSF(): SFSchema { diff --git a/src/app/routes/financial-management/services/freight-account.service.ts b/src/app/routes/financial-management/services/freight-account.service.ts index 65b1abe1..99477de7 100644 --- a/src/app/routes/financial-management/services/freight-account.service.ts +++ b/src/app/routes/financial-management/services/freight-account.service.ts @@ -42,6 +42,8 @@ export class FreightAccountService extends ShipperBaseService { // 货主端获取账户余额交易明细 $api_get_balance_by_shipper = '/api/fcc/accountBalanceDetail/getAccountBalanceByShipperPage'; + // 运营端导出货主账户明细信息 + $api_export_shipper = '/api/fcc/accountBalance/reportShipperAccountBalanceByOperator'; // 查询订单支付申请表 $api_get_order_payment_page = '/api/fcc/billPaymentApplicationOBC/list/page'; 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 4d21c024..9439bc2a 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 @@ -33,7 +33,7 @@
- {{selectItem?.enterpriseName}} + {{selectItem?.enterpriseName || selectItem?.contactName}} @@ -62,7 +62,8 @@ + ]" [req]="{ process: beforeReq,params:{effectiveStatus:2 ,newPartnerId:selectItem.id} }" + [loading]="service.http.loading" [page]="{show:false}"> diff --git a/src/app/routes/partner/partner-list/components/index/partner-list.component.less b/src/app/routes/partner/partner-list/components/index/partner-list.component.less deleted file mode 100644 index e69de29b..00000000 diff --git a/src/app/routes/partner/partner-list/components/index/partner-list.component.ts b/src/app/routes/partner/partner-list/components/index/partner-list.component.ts index 5b5c457e..cc275ba8 100644 --- a/src/app/routes/partner/partner-list/components/index/partner-list.component.ts +++ b/src/app/routes/partner/partner-list/components/index/partner-list.component.ts @@ -49,7 +49,7 @@ export class PartnerListComponent { return requestOptions; }; - loadSelectOptions(){ + loadSelectOptions() { this.service.getRebateConfig().subscribe(res => { if (res) { this.customers = res; @@ -57,7 +57,7 @@ export class PartnerListComponent { }); this.service.getChannel().subscribe(res => { if (res) { - this.customers = res; + this.cannels = res; } }); } @@ -66,13 +66,14 @@ export class PartnerListComponent { const modal = this.nzModalService.create({ nzTitle: '审核', nzContent: PartnerAuditModalComponent, - nzComponentParams: { info: { ...item, enterpriseName: item.enterpriseName || item.contactName } }, + nzComponentParams: { info: { ...item, enterpriseName: item.enterpriseName || item.contactName },sourcePage:'合伙人审核列表' }, nzFooter: null }); } editTemplateAction(item: any) { this.selectItem = item; + this.templateId = item.templateId || null; const modal = this.nzModalService.create({ nzTitle: '修改返佣模板', nzContent: this.editTemplate, @@ -87,7 +88,7 @@ export class PartnerListComponent { }); } - confirmEditTemplate() { + private confirmEditTemplate() { const modal = this.nzModalService.confirm({ nzTitle: '确定要修改返佣模板吗？', nzOnOk: () => { @@ -108,16 +109,21 @@ export class PartnerListComponent { } editCannelAction(item: any) { - this.selectItem = item; - const modal = this.nzModalService.create({ - nzTitle: '修改渠道销售', - nzWidth: 650, - nzContent: this.editCannel, - nzOnOk: () => { - this.confirmEditCannel(item); - return false; + // 校验合伙人是否可修改渠道销售 true:可以修改 false：不可以修改 + this.service.request(this.service.$api_check_partenr_change_channel,{id:item.id}).subscribe(res=>{ + if(res){ + this.selectItem = item; + const modal = this.nzModalService.create({ + nzTitle: '修改渠道销售', + nzWidth: 650, + nzContent: this.editCannel, + nzOnOk: () => { + this.confirmEditCannel(item); + return false; + } + }); } - }); + }) } confirmEditCannel(item: any) { @@ -321,7 +327,12 @@ export class PartnerListComponent { private initST(): STColumn[] { return [ - { title: '合伙人名称', index: 'enterpriseName', width: 180, format: item => `${item.enterpriseName || item.contactName}` }, + { + title: '合伙人名称', + index: 'enterpriseName', + width: 180, + format: item => (item.partnerType ? `${item.enterpriseName || item.contactName}` : '') + }, { title: '付款编码', index: 'payCode', width: 160 }, { title: '邀请码', index: 'invitationCode', className: 'text-center', width: 130 }, { title: '企业管理员', index: 'contactName', width: 150 }, @@ -386,6 +397,7 @@ export class PartnerListComponent { { type: 'divider' }, { text: '详情', + iif: item => item.id, click: item => { if (item.partnerType === 1) { this.router.navigate([`/partner/partner-list/etp-detail/${item.id}`]); @@ -396,19 +408,23 @@ export class PartnerListComponent { }, { text: '审核
', + iif: item => item.id, click: item => this.auditPartner(item) }, { text: '修改返佣模板', + iif: item => item.id, click: item => this.editTemplateAction(item) }, { text: '修改渠道销售', + iif: item => item.id, click: item => this.editCannelAction(item) }, { text: '重发CRM流程', - click: item => this.reSendCRM(item) + click: item => item.id && this.reSendCRM(item), + iif: item => item.crmStatus === 10 } ] } diff --git a/src/app/routes/partner/partner-list/components/partner-audit-modal/partner-audit-modal.component.ts b/src/app/routes/partner/partner-list/components/partner-audit-modal/partner-audit-modal.component.ts index 8c2586a8..6e271d70 100644 --- a/src/app/routes/partner/partner-list/components/partner-audit-modal/partner-audit-modal.component.ts +++ b/src/app/routes/partner/partner-list/components/partner-audit-modal/partner-audit-modal.component.ts @@ -14,6 +14,7 @@ export class PartnerAuditModalComponent implements OnInit { @Input() info: any; schema!: SFSchema; + sourcePage = ''; constructor(private nzModalService: NzModalService, public service: PartnerListService) {} ngOnInit(): void { @@ -53,13 +54,11 @@ export class PartnerAuditModalComponent implements OnInit { channelId: { title: '渠道销售', type: 'string', - enum: [ - { value: true, label: '通过' }, - { value: false, label: '驳回' } - ], ui: { widget: 'select', placeholder: '请选择', + allowClear: true, + asyncData: () => this.service.getChannel(), hidden: this.info.isPass === false, visibleIf: { status: value => value @@ -115,7 +114,8 @@ export class PartnerAuditModalComponent implements OnInit { .request(this.service.$api_audit_partner, { auditStatusEnum: params.auditStatusEnum, id: params.id, - approvalOpinion: params.approvalOpinion + approvalOpinion: params.approvalOpinion, + sourcePage: this.sourcePage }) .subscribe(res => { if (res) { diff --git a/src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.html b/src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.html index 777d019f..98adf913 100644 --- a/src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.html +++ b/src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.html @@ -125,7 +125,8 @@ [nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit ? 'calendar' : ''" style="width: 100px" class="calendar"> - - + 修改渠道销售记录 + [req]="{params:{partnerId:route.snapshot.params.id}}" [loading]="service.http.loading" bordered size="small" + [page]="{ show: false }" [scroll]="{ x: '1200px' }"> @@ -316,13 +318,15 @@ -

转移客户数：10

- +

转移客户数：{{changeST?.total}}

+ -

不转移客户数：10

- +

不转移客户数：{{noChangeST?.total}}

+

客户转移：客户跟着上级合伙人转移一并到新渠道销售下，会同步发起CRM《客户转移》流程；不转移的，客户会与上级合伙人解绑，修改成功后，修改时间也是合伙人与客户的结算结束时间，成为原来渠道销售的直客。 diff --git a/src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.ts b/src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.ts index 94b4c869..61559772 100644 --- a/src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.ts +++ b/src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.ts @@ -47,7 +47,7 @@ export class PartnerDetailComponent implements OnInit, OnDestroy { subscribeScoll!: Subscription; constructor( public service: PartnerListService, - private route: ActivatedRoute, + public route: ActivatedRoute, private nzModalService: NzModalService, private datePipe: DatePipe ) {} @@ -138,7 +138,7 @@ export class PartnerDetailComponent implements OnInit, OnDestroy { const modal = this.nzModalService.create({ nzTitle: '审核', nzContent: PartnerAuditModalComponent, - nzComponentParams: { info: { ...this.detailData, isPass } }, + nzComponentParams: { info: { ...this.detailData, isPass },sourcePage:'合伙人审核详情' }, nzFooter: null }); } @@ -366,13 +366,13 @@ export class PartnerDetailComponent implements OnInit, OnDestroy { private initST(): { logsColumn: STColumn[]; changeColumn: STColumn[]; beChangeColumn: STColumn[] } { return { logsColumn: [ - { title: '修改后渠道销售', index: 'newChannelName', width: 180 }, - { title: '修改前渠道销售', index: 'originalChannelName', width: 160 }, + { title: '修改后渠道销售', index: 'newChannelIdLabel', width: 180 }, + { title: '修改前渠道销售', index: 'originalChannelIdLabel', width: 160 }, { title: '转移客户数', index: 'quantity', className: 'text-center', width: 130 }, { title: '生效节点', index: 'effectiveNode', width: 150, type: 'enum', enum: { 1: '立即生效', 2: 'CRM审核后生效' } }, { title: '备注', index: 'remark', className: 'text-center', width: 150 }, - { title: '修改时间', index: 'effectiveTime', className: 'text-center', width: 130, type: 'date' }, - { title: '操作人', index: 'modifyUserId', width: 130 }, + { title: '修改时间', index: 'effectiveTime', className: 'text-center', width: 180, type: 'date' }, + { title: '操作人', index: 'modifyUserIdLabel', width: 180 }, { title: '操作', fixed: 'right', diff --git a/src/app/routes/partner/partner-list/components/personal-partner-detail/personal-partner-detail.component.ts b/src/app/routes/partner/partner-list/components/personal-partner-detail/personal-partner-detail.component.ts index c6da1adc..6ee8f6d5 100644 --- a/src/app/routes/partner/partner-list/components/personal-partner-detail/personal-partner-detail.component.ts +++ b/src/app/routes/partner/partner-list/components/personal-partner-detail/personal-partner-detail.component.ts @@ -113,7 +113,10 @@ export class PersonalPartnerDetailComponent implements OnInit { const modal = this.nzModalService.create({ nzTitle: '审核', nzContent: PartnerAuditModalComponent, - nzComponentParams: { info: { ...this.detailData, isPass, enterpriseName: this.detailData.adminUserInfo?.name } }, + nzComponentParams: { + info: { ...this.detailData, isPass, enterpriseName: this.detailData.adminUserInfo?.name }, + sourcePage: '合伙人审核详情' + }, nzFooter: null }); } diff --git a/src/app/routes/partner/partner-list/services/partner-list.service.ts b/src/app/routes/partner/partner-list/services/partner-list.service.ts index 77ba94b4..582668d7 100644 --- a/src/app/routes/partner/partner-list/services/partner-list.service.ts +++ b/src/app/routes/partner/partner-list/services/partner-list.service.ts @@ -28,7 +28,11 @@ export class PartnerListService extends ShipperBaseService { // 查询合伙人修改渠道渠道销售记录 $api_get_personal_channel_list = '/api/mdc/partnerChannelRelLog/list/page'; // 查询客户关系列表-不分页 - $api_get_enterprice_rel_list = '/api/mdc/enterpriceRelLog/list'; + $api_get_enterprice_rel_list = '/api/mdc/EnterpriseRelLog/list'; + // 校验合伙人是否可修改渠道销售 true:可以修改 false：不可以修改 + $api_check_partenr_change_channel = '/api/mdc/partner/updateChannelCheck'; + // 渠道销售修改详情 + $api_get_partner_change_list = '/api/mdc/partnerChannelRelLog/partnerChannelUpdateDetaiList'; // 冻结/启用企业业 $api_lock_freight = '/api/mdc/cuc/enterpriseInfo/operate/lock'; diff --git a/src/app/shared/services/business/shipper-base.service.ts b/src/app/shared/services/business/shipper-base.service.ts index 9d60db0e..381791a4 100644 --- a/src/app/shared/services/business/shipper-base.service.ts +++ b/src/app/shared/services/business/shipper-base.service.ts @@ -29,7 +29,7 @@ export class ShipperBaseService extends BaseService { /** * 获取无车承运人 - * @returns + * @returns */ getCarlessCarrier() { const params = {}; @@ -267,7 +267,7 @@ export class ShipperBaseService extends BaseService { map(res => { if (res) { return res.map((m: any) => { - return { label: m.name, value: m.id }; + return { label: `${m.employeeVO?.empName}/${m.employeeVO?.mobile}`, value: m.id }; }); } else { return []; From 3c6d526dc26cc307cd29b2e3d54c4c8430189cc7 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Fri, 25 Mar 2022 16:05:34 +0800 Subject: [PATCH 72/99] edit --- .../withdrawals-detail/withdrawals-detail.component.html | 8 +++----- .../withdrawals-detail/withdrawals-detail.component.ts | 6 +++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.html b/src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.html index 3ba4fb26..1425c22a 100644 --- a/src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.html +++ b/src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.html @@ -62,8 +62,7 @@ [ui]="{ '*': { spanLabelFixed: 110,grid: { lg: 8, md: 12, sm: 12, xs: 24 } }}" [compact]="true" [button]="'none'">

-
+
@@ -73,9 +72,8 @@
- + {{index+1}} diff --git a/src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.ts b/src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.ts index 60812cec..5134ce46 100644 --- a/src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.ts +++ b/src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.ts @@ -220,14 +220,14 @@ export class WithdrawalsDetailComponent implements OnInit { width: 140 }, { title: '运费明细', index: 'billHId', className: 'text-center', width: 150 }, - { title: '货主', index: 'billHId', className: 'text-center', width: 150 }, + { title: '货主', index: 'ltdName', className: 'text-center', width: 150 }, { title: '订单号', index: 'billHId', className: 'text-center', width: 150 }, { title: '运单号', index: 'billHId', className: 'text-center', width: 150 }, { title: '货源编号', index: 'billHId', className: 'text-center', width: 150 }, { title: '服务类型', index: 'billHId', className: 'text-center', width: 150 }, - { title: '承运司机', index: 'billHId', className: 'text-center', width: 150 }, + { title: '承运司机', index: 'driverId', className: 'text-center', width: 150 }, { title: '收款人', index: 'billHId', className: 'text-center', width: 150 }, - { title: '银行类型', index: 'billHId', className: 'text-center', width: 150 } + { title: '银行类型', index: 'billType', className: 'text-center', width: 150 } ]; } } From dc19b07de73e25b4034fd7c88bf9998045152c28 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Fri, 25 Mar 2022 16:09:42 +0800 Subject: [PATCH 73/99] edit --- proxy.conf.js | 2 +- .../invoice-requested/invoice-requested.component.ts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/proxy.conf.js b/proxy.conf.js index 10071e14..67c15ee2 100644 --- a/proxy.conf.js +++ b/proxy.conf.js @@ -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/ticket-management/components/invoice-requested/invoice-requested.component.ts b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts index f1c5e073..45af1277 100644 --- a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts +++ b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts @@ -90,7 +90,7 @@ export class InvoiceRequestedComponent { return false; } let ids = item.map(row => row.id); - this.service.request(this.service.$api_reject_invoice, ids).subscribe(res => { + this.service.request(this.service.$api_reject_invoice, { id: ids, rejectContent: this.rejectReason }).subscribe(res => { if (res) { this.service.msgSrv.success('驳回成功'); modal.destroy(true); @@ -133,7 +133,7 @@ export class InvoiceRequestedComponent { this.service .request(this.service.$api_update_invoice_address, { ...component.sf.value, - + id: item.map(i => i.id) }) .subscribe(res => { if (res) { From d6b0f9359c09bc803fffd131abd782ab0fe9921d Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Fri, 25 Mar 2022 16:22:43 +0800 Subject: [PATCH 74/99] edit --- .../withdrawals-detail.component.html | 23 ++++++++++++-- .../withdrawals-detail.component.ts | 31 ++++++++++++------- 2 files changed, 40 insertions(+), 14 deletions(-) diff --git a/src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.html b/src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.html index 1425c22a..667027cd 100644 --- a/src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.html +++ b/src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.html @@ -74,8 +74,27 @@
- - {{index+1}} + + + {{detail.costName}}:{{detail.price |currency}} + + + + {{item.billCode}}
+ {{item.billStatus}}
+ + + {{item.wayBillCode}}
+ {{item.wayBillStatus}}
+ + + {{item.driverName}}
+ {{item.driverTelephone}}
+ {{item.driverLicencePlate}}
+ + + {{item.captainName}}
+ {{item.captainTelephone}}
 diff --git a/src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.ts b/src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.ts index 5134ce46..77f2cfd9 100644 --- a/src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.ts +++ b/src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.ts @@ -210,24 +210,31 @@ export class WithdrawalsDetailComponent implements OnInit { private initST(): STColumn[] { return [ - { title: '支付编号', index: 'brmHCode', className: 'text-left', width: 200 }, + { title: '支付编号', index: 'orderPaymentCode', className: 'text-left', width: 200 }, { title: '支付金额', - index: 'yskmoney', + index: 'payAmount', type: 'widget', className: 'text-right', - widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.yskmoney }) }, + widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.payAmount }) }, width: 140 }, - { title: '运费明细', index: 'billHId', className: 'text-center', width: 150 }, - { title: '货主', index: 'ltdName', className: 'text-center', width: 150 }, - { title: '订单号', index: 'billHId', className: 'text-center', width: 150 }, - { title: '运单号', index: 'billHId', className: 'text-center', width: 150 }, - { title: '货源编号', index: 'billHId', className: 'text-center', width: 150 }, - { title: '服务类型', index: 'billHId', className: 'text-center', width: 150 }, - { title: '承运司机', index: 'driverId', className: 'text-center', width: 150 }, - { title: '收款人', index: 'billHId', className: 'text-center', width: 150 }, - { title: '银行类型', index: 'billType', className: 'text-center', width: 150 } + { title: '运费明细', render: 'amountDetails', className: 'text-center', width: 150 }, + { title: '货主', index: 'ltdName', className: 'text-center', width: 200 }, + { title: '订单号', render: 'billId', className: 'text-center', width: 150 }, + { title: '运单号', render: 'wayBillId', className: 'text-center', width: 150 }, + { title: '货源编号', index: 'resourceCode', className: 'text-center', width: 150 }, + { + title: '服务类型', + index: 'serviceType', + className: 'text-center', + width: 150, + type: 'enum', + enum: { '1': '抢单', '2': '指派', '3': '二维码', '4': '手工单' } + }, + { title: '承运司机', render: 'driverId', className: 'text-center', width: 150 }, + { title: '收款人', render: 'captainName', className: 'text-center', width: 150 }, + { title: '银行类型', index: 'bankType', className: 'text-center', width: 150 } ]; } } From a115d81fa741c533c2ccc511b26dc175e2bac8d9 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 25 Mar 2022 16:22:44 +0800 Subject: [PATCH 75/99] fix bug --- .../list/carauth/carauth.component.html | 18 +- .../list/carauth/carauth.component.less | 24 +- .../list/carauth/carauth.component.ts | 335 +++++++++--------- 3 files changed, 199 insertions(+), 178 deletions(-) diff --git a/src/app/routes/vehicle/components/list/carauth/carauth.component.html b/src/app/routes/vehicle/components/list/carauth/carauth.component.html index 150b90d0..9eda46b1 100644 --- a/src/app/routes/vehicle/components/list/carauth/carauth.component.html +++ b/src/app/routes/vehicle/components/list/carauth/carauth.component.html @@ -2,9 +2,9 @@ * @Description : * @Version : 1.0 * @Author : Shiming - * @Date : 2022-02-16 10:09:23 + * @Date : 2022-03-14 14:17:38 * @LastEditors : Shiming - * @LastEditTime : 2022-02-16 10:14:29 + * @LastEditTime : 2022-03-25 16:22:32 * @FilePath : \\tms-obc-web\\src\\app\\routes\\vehicle\\components\\list\\carauth\\carauth.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -32,12 +32,16 @@
+ + + + + + - - - - + +
- +
\ No newline at end of file diff --git a/src/app/routes/vehicle/components/list/carauth/carauth.component.less b/src/app/routes/vehicle/components/list/carauth/carauth.component.less index e3f1fc3f..ee4cb587 100644 --- a/src/app/routes/vehicle/components/list/carauth/carauth.component.less +++ b/src/app/routes/vehicle/components/list/carauth/carauth.component.less @@ -75,7 +75,7 @@ .pa { position: absolute; top: 35px; - left: 150px; + left: 140px; } .tips { @@ -96,7 +96,7 @@ .drivercard{ position: absolute; top: 0; - left: 330px; + left: 325px; border: solid 1px #ebf0fb; } .jopcard{ @@ -113,11 +113,17 @@ } :host{ ::ng-deep { - .ant-input-borderless{ - padding: 0; - padding-top: 4px; - color: black; - resize:none; - } + .ant-input-borderless{ + padding: 0; + padding-top: 4px; + color: black; + resize:none; + } + .setCustom .ant-form-item-control{ + margin-left: -100px !important + } + .borderImg{ + border: solid 1px #ebf0fb; + } } - } \ No newline at end of file +} \ No newline at end of file diff --git a/src/app/routes/vehicle/components/list/carauth/carauth.component.ts b/src/app/routes/vehicle/components/list/carauth/carauth.component.ts index 16e43dcc..bbd91cfb 100644 --- a/src/app/routes/vehicle/components/list/carauth/carauth.component.ts +++ b/src/app/routes/vehicle/components/list/carauth/carauth.component.ts @@ -24,38 +24,37 @@ export class CarSettleCarauthComponent implements OnInit { showJopFlag = false; companyData: any = {}; detailData: any = {}; - carNo = ''; - + carNo = '' + constructor( private modal: NzModalRef, public service: VehicleService, private envSrv: EAEnvironmentService, - private eaCacheSrv: EACacheService - ) {} + private eaCacheSrv: EACacheService, + ) { } ngOnInit(): void { - console.log(this.i) - this.initData(); - this.initSF(); + this.initData() + this.initSF() } initData() { - if (this.i?.id) { - this.companyData = this.eaCacheSrv.get(cacheConf.env); + if (this.i.id) { + this.companyData = this.eaCacheSrv.get(cacheConf.env) const params = { - id: this.i?.id - }; + id: this.i.id, + } this.service.request(this.service.$api_shipperCarGet, params).subscribe(res => { - this.detailData = res; - this.detailData.isSelf = res.isSelf ? 1 : 0; - this.detailData.isTrailer = res.isTrailer ? 1 : 0; + this.detailData = res + this.detailData.isSelf = res.isSelf ? 1 : 0 + this.detailData.isTrailer = res.isTrailer ? 1 : 0 this.detailData.carFrontPhotoWatermark = [ { uid: -1, name: 'LOGO', status: 'done', url: this.detailData.carFrontPhotoWatermark, - response: this.detailData.carFrontPhotoWatermark - } + response: this.detailData.carFrontPhotoWatermark, + }, ]; this.detailData.carProtocalWatermark = [ { @@ -63,8 +62,8 @@ export class CarSettleCarauthComponent implements OnInit { name: 'LOGO', status: 'done', url: this.detailData.carProtocalWatermark, - response: this.detailData.carProtocalWatermark - } + response: this.detailData.carProtocalWatermark, + }, ]; this.detailData.certificatePhotoFrontWatermark = [ { @@ -72,8 +71,8 @@ export class CarSettleCarauthComponent implements OnInit { name: 'LOGO', status: 'done', url: this.detailData.certificatePhotoFrontWatermark, - response: this.detailData.certificatePhotoFrontWatermark - } + response: this.detailData.certificatePhotoFrontWatermark, + }, ]; this.detailData.certificatePhotoBackWatermark = [ { @@ -81,8 +80,8 @@ export class CarSettleCarauthComponent implements OnInit { name: 'LOGO', status: 'done', url: this.detailData.certificatePhotoBackWatermark, - response: this.detailData.certificatePhotoBackWatermark - } + response: this.detailData.certificatePhotoBackWatermark, + }, ]; this.detailData.roadTransportPhotoWatermark = [ { @@ -90,10 +89,10 @@ export class CarSettleCarauthComponent implements OnInit { name: 'LOGO', status: 'done', url: this.detailData.roadTransportPhotoWatermark, - response: this.detailData.roadTransportPhotoWatermark - } + response: this.detailData.roadTransportPhotoWatermark, + }, ]; - }); + }) } } initSF() { @@ -104,7 +103,7 @@ export class CarSettleCarauthComponent implements OnInit { title: '车头照照片', ui: { action: apiConf.fileUpload, - fileType: 'image/png,image/jpeg,image/jpg,image/gif', + accept: 'image/png,image/jpeg,image/jpg,image/gif', limit: 1, limitFileCount: 1, resReName: 'data.fullFileWatermarkPath', @@ -112,21 +111,21 @@ export class CarSettleCarauthComponent implements OnInit { widget: 'upload', descriptionI18n: '请上传车头照照片，支持JPG、PNG格式，文件小于5M。', data: { - appId: this.envSrv.env.appId + appId: this.envSrv.env.appId, }, name: 'multipartFile', multiple: false, listType: 'picture-card', change: (args: any) => { if (args.type === 'success') { - this.detailData.carFrontPhoto = args.file.response.data.fullFilePath; + this.detailData.carFrontPhoto = args.file.response.data.fullFilePath } }, beforeUpload: (file: any, _fileList: any) => { return new Observable((observer: Observer) => { - const isLt2M = file.size / 1024 / 1024 < 2; + const isLt2M = file.size / 1024 / 1024 < 5; if (!isLt2M) { - this.service.msgSrv.warning('图片大小超过2M!'); + this.service.msgSrv.warning('图片大小超过5M!'); observer.complete(); return; } @@ -134,7 +133,7 @@ export class CarSettleCarauthComponent implements OnInit { observer.complete(); }); }, - // previewFile: (file: NzUploadFile) => of(file.url) + previewFile: (file: NzUploadFile) => of(file.url), } }, carNo: { @@ -142,8 +141,8 @@ export class CarSettleCarauthComponent implements OnInit { maxLength: 9, type: 'string', ui: { - placeholder: '请输入' - } + placeholder: '请输入', + }, }, carNoColor: { title: '车牌颜色', @@ -151,9 +150,9 @@ export class CarSettleCarauthComponent implements OnInit { ui: { widget: 'dict-select', params: { dictKey: 'car:color' }, - placeholder: '请选择车型', - containsAllLabel: false - } as SFSelectWidgetSchema + placeholder: '请选择车牌颜色', + containsAllLabel:false, + } as SFSelectWidgetSchema, }, carModel: { title: '车型', @@ -162,8 +161,8 @@ export class CarSettleCarauthComponent implements OnInit { widget: 'dict-select', params: { dictKey: 'car:model' }, placeholder: '请选择车型', - containsAllLabel: false - } as SFSelectWidgetSchema + containsAllLabel:false, + } as SFSelectWidgetSchema, }, carLength: { title: '车长', @@ -172,8 +171,8 @@ export class CarSettleCarauthComponent implements OnInit { widget: 'dict-select', params: { dictKey: 'car:length' }, placeholder: '请选择车长', - containsAllLabel: false - } as SFSelectWidgetSchema + containsAllLabel:false, + } as SFSelectWidgetSchema, }, carLoad: { title: '载重', @@ -181,10 +180,11 @@ export class CarSettleCarauthComponent implements OnInit { maxLength: 6, ui: { placeholder: '请输入', - change: (val: any) => { - const value = val.replace(/\D/g, ''); - this.sf.setValue('/carLoad', value); - } + addOnAfter: '吨', + change: (val: any) =>{ + const value = val.replace(/\D/g,'') + this.sf.setValue('/carLoad', value) + }, } }, isSelf: { @@ -192,11 +192,11 @@ export class CarSettleCarauthComponent implements OnInit { type: 'string', enum: [ { label: '否', value: 0 }, - { label: '是', value: 1 } + { label: '是', value: 1 }, ], ui: { widget: 'select', - placeholder: '请选择' + placeholder: '请选择', } }, isTrailer: { @@ -204,11 +204,11 @@ export class CarSettleCarauthComponent implements OnInit { type: 'string', enum: [ { label: '否', value: 0 }, - { label: '是', value: 1 } + { label: '是', value: 1 }, ], ui: { widget: 'select', - placeholder: '请选择' + placeholder: '请选择', } }, carProtocalWatermark: { @@ -216,7 +216,7 @@ export class CarSettleCarauthComponent implements OnInit { title: '挂靠协议', ui: { action: apiConf.fileUpload, - fileType: 'image/png,image/jpeg,image/jpg,image/gif', + accept: 'image/png,image/jpeg,image/jpg,image/gif', limit: 1, limitFileCount: 1, resReName: 'data.fullFileWatermarkPath', @@ -224,14 +224,14 @@ export class CarSettleCarauthComponent implements OnInit { widget: 'upload', descriptionI18n: '请上传挂靠协议，支持JPG、PNG格式，文件小于5M。', data: { - appId: this.envSrv.env.appId + appId: this.envSrv.env.appId, }, name: 'multipartFile', multiple: false, listType: 'picture-card', change: (args: any) => { if (args.type === 'success') { - this.detailData.certificatePhotoFront = args.file.response.data.fullFilePath; + this.detailData.certificatePhotoFront = args.file.response.data.fullFilePath } }, beforeUpload: (file: any, _fileList: any) => { @@ -246,31 +246,39 @@ export class CarSettleCarauthComponent implements OnInit { observer.complete(); }); }, - // previewFile: (file: NzUploadFile) => of(file.url) + previewFile: (file: NzUploadFile) => of(file.url), + } + }, + agreeImg: { + title: '', + type: 'boolean', + // enum: [{ label: '长期', value: true }], + ui: { + widget: 'custom', } }, titleA: { title: '行驶证信息(必填）', type: 'string', ui: { - widget: 'text' + widget: 'text', }, - default: '照片上传后会自动识别文字并填充下列内容栏' + default: '照片上传后会自动识别文字并填充下列内容栏', }, tipsA: { title: '', type: 'string', ui: { widget: 'custom', - offsetControl: 6 - } + offsetControl: 6, + }, }, certificatePhotoFrontWatermark: { type: 'string', title: '行驶证首页照片', ui: { action: apiConf.fileUpload, - fileType: 'image/png,image/jpeg,image/jpg,image/gif', + accept: 'image/png,image/jpeg,image/jpg,image/gif', limit: 1, limitFileCount: 1, resReName: 'data.fullFileWatermarkPath', @@ -278,24 +286,24 @@ export class CarSettleCarauthComponent implements OnInit { widget: 'upload', descriptionI18n: '请上传行驶证首页照片，支持JPG、PNG格式，文件小于5M。照片信息缺失、拼凑、过度PS、模糊不清，都不会通过审核。', data: { - appId: this.envSrv.env.appId + appId: this.envSrv.env.appId, }, name: 'multipartFile', multiple: false, listType: 'picture-card', change: (args: any) => { if (args.type === 'success') { - this.detailData.certificatePhotoFront = args.file.response.data.fullFilePath; + this.detailData.certificatePhotoFront = args.file.response.data.fullFilePath this.checkCarCard(args.file.response.data.fullFilePath, 'front'); } else { - this.detailData.certificatePhotoFront = ''; + this.detailData.certificatePhotoFront = '' } }, beforeUpload: (file: any, _fileList: any) => { return new Observable((observer: Observer) => { - const isLt2M = file.size / 1024 / 1024 < 2; + const isLt2M = file.size / 1024 / 1024 < 5; if (!isLt2M) { - this.service.msgSrv.warning('图片大小超过2M!'); + this.service.msgSrv.warning('图片大小超过5M!'); observer.complete(); return; } @@ -303,7 +311,7 @@ export class CarSettleCarauthComponent implements OnInit { observer.complete(); }); }, - // previewFile: (file: NzUploadFile) => of(file.url) + previewFile: (file: NzUploadFile) => of(file.url), } }, tipsB: { @@ -311,15 +319,15 @@ export class CarSettleCarauthComponent implements OnInit { type: 'string', ui: { widget: 'custom', - offsetControl: 6 - } + offsetControl: 6, + }, }, certificatePhotoBackWatermark: { type: 'string', title: '行驶证副页照片', ui: { action: apiConf.fileUpload, - fileType: 'image/png,image/jpeg,image/jpg,image/gif', + accept: 'image/png,image/jpeg,image/jpg,image/gif', limit: 1, limitFileCount: 1, resReName: 'data.fullFileWatermarkPath', @@ -327,24 +335,24 @@ export class CarSettleCarauthComponent implements OnInit { widget: 'upload', descriptionI18n: '请上传行驶证副业照片，支持JPG、PNG格式，文件小于5M。', data: { - appId: this.envSrv.env.appId + appId: this.envSrv.env.appId, }, name: 'multipartFile', multiple: false, listType: 'picture-card', change: (args: any) => { if (args.type === 'success') { - this.detailData.certificatePhotoBack = args.file.response.data.fullFilePath; + this.detailData.certificatePhotoBack = args.file.response.data.fullFilePath this.checkCarCard(args.file.response.data.fullFilePath, 'back'); } else { - this.detailData.certificatePhotoBack = ''; + this.detailData.certificatePhotoBack = '' } }, beforeUpload: (file: any, _fileList: any) => { return new Observable((observer: Observer) => { - const isLt2M = file.size / 1024 / 1024 < 2; + const isLt2M = file.size / 1024 / 1024 < 5; if (!isLt2M) { - this.service.msgSrv.warning('图片大小超过2M!'); + this.service.msgSrv.warning('图片大小超过5M!'); observer.complete(); return; } @@ -352,7 +360,7 @@ export class CarSettleCarauthComponent implements OnInit { observer.complete(); }); }, - // previewFile: (file: NzUploadFile) => of(file.url) + previewFile: (file: NzUploadFile) => of(file.url), } }, driverLicenseRegisterTime: { @@ -360,16 +368,16 @@ export class CarSettleCarauthComponent implements OnInit { type: 'string', format: 'date', ui: { - placeholder: '请输入' - } + placeholder: '请输入', + }, }, driverLicenseGetTime: { title: '行驶证发证日期', type: 'string', format: 'date', ui: { - placeholder: '请输入' - } + placeholder: '请输入', + }, }, driverLicenseEndTime: { title: '行驶证到期日期', @@ -377,24 +385,24 @@ export class CarSettleCarauthComponent implements OnInit { format: 'date', maxLength: 30, ui: { - placeholder: '请输入' - } + placeholder: '请输入', + }, }, driverLicenseSigningOrg: { title: '行驶证签发机关', type: 'string', maxLength: 30, ui: { - placeholder: '请输入' - } + placeholder: '请输入', + }, }, carDistinguishCode: { title: '车辆识别代码', type: 'string', maxLength: 30, ui: { - placeholder: '请输入' - } + placeholder: '请输入', + }, }, useNature: { title: '使用性质', @@ -402,42 +410,42 @@ export class CarSettleCarauthComponent implements OnInit { maxLength: 30, enum: [ { label: '非营运', value: 0 }, - { label: '营运', value: 1 } + { label: '营运', value: 1 }, ], ui: { widget: 'select', - placeholder: '请选择' - } + placeholder: '请选择', + }, }, curbWeight: { title: '整备质量', type: 'string', ui: { - placeholder: '请输入' - } + placeholder: '请输入', + }, }, carOwner: { title: '所有人', type: 'string', maxLength: 30, ui: { - placeholder: '请输入' - } + placeholder: '请输入', + }, }, titleB: { title: '道运证(选填）', type: 'string', ui: { - widget: 'text' + widget: 'text', }, - default: '照片上传后会自动识别文字并填充下列内容栏' + default: '照片上传后会自动识别文字并填充下列内容栏', }, roadTransportPhotoWatermark: { type: 'string', title: '道运证照片', ui: { action: apiConf.fileUpload, - fileType: 'image/png,image/jpeg,image/jpg,image/gif', + accept: 'image/png,image/jpeg,image/jpg,image/gif', limit: 1, limitFileCount: 1, resReName: 'data.fullFileWatermarkPath', @@ -445,24 +453,24 @@ export class CarSettleCarauthComponent implements OnInit { widget: 'upload', descriptionI18n: '请上传道运证照片，支持JPG、PNG格式，文件小于5M。蓝牌绿牌车辆，可不用传道运证', data: { - appId: this.envSrv.env.appId + appId: this.envSrv.env.appId, }, name: 'multipartFile', multiple: false, listType: 'picture-card', change: (args: any) => { if (args.type === 'success') { - this.detailData.roadTransportPhoto = args.file.response.data.fullFilePath; + this.detailData.roadTransportPhoto = args.file.response.data.fullFilePath this.checkTransCard(args.file.response.data.fullFilePath); } else { - this.detailData.roadTransportPhoto = ''; + this.detailData.roadTransportPhoto = '' } }, beforeUpload: (file: any, _fileList: any) => { return new Observable((observer: Observer) => { - const isLt2M = file.size / 1024 / 1024 < 2; + const isLt2M = file.size / 1024 / 1024 < 5; if (!isLt2M) { - this.service.msgSrv.warning('图片大小超过2M!'); + this.service.msgSrv.warning('图片大小超过5M!'); observer.complete(); return; } @@ -470,7 +478,15 @@ export class CarSettleCarauthComponent implements OnInit { observer.complete(); }); }, - // previewFile: (file: NzUploadFile) => of(file.url) + previewFile: (file: NzUploadFile) => of(file.url), + } + }, + roadImg: { + title: '', + type: 'boolean', + // enum: [{ label: '长期', value: true }], + ui: { + widget: 'custom', } }, roadTransportNo: { @@ -479,8 +495,8 @@ export class CarSettleCarauthComponent implements OnInit { maxLength: 30, ui: { // widget: this.detailData.commitFlag !== 0 ? 'text' : '', - placeholder: '请输入' - } + placeholder: '请输入', + }, }, roadTransportLicenceNo: { title: '经营许可证号', @@ -488,25 +504,25 @@ export class CarSettleCarauthComponent implements OnInit { maxLength: 30, ui: { // widget: this.detailData.commitFlag !== 0 ? 'text' : '', - placeholder: '请输入' - } + placeholder: '请输入', + }, }, roadTransportStartTime: { title: '发证日期', type: 'string', format: 'date', ui: { - placeholder: '请输入' - } + placeholder: '请输入', + }, }, roadTransportEndTime: { title: '有效期至', type: 'string', format: 'date', ui: { - placeholder: '请输入' - } - } + placeholder: '请输入', + }, + }, }, required: [ 'carFrontPhotoWatermark', @@ -526,62 +542,61 @@ export class CarSettleCarauthComponent implements OnInit { 'carDistinguishCode', 'useNature', 'carOwner' - ] + ], }; this.ui = { '*': { spanLabelFixed: 180, grid: { span: 18 }, - width: 600 + width: 600, }, $title1: { - spanLabelFixed: 0 + spanLabelFixed: 0, }, $title2: { - spanLabelFixed: 0 + spanLabelFixed: 0, }, $title3: { - spanLabelFixed: 0 + spanLabelFixed: 0, }, - $enterpriseRegistrationTime: { - width: 680 + $isTrailer:{ + grid: { span: 24 }, }, - $operatingEndTime: { - grid: { span: 9 } + $carProtocalWatermark: { + grid: { span:12 }, }, - $dateType: { - grid: { span: 4 } + $agreeImg: { + grid: { span: 4 }, + class: 'setCustom' }, - $validEndTime: { - grid: { span: 9 } + $titleB:{ + grid: { span: 24 }, }, - $dateType01: { - grid: { span: 4 } + $roadTransportPhotoWatermark: { + grid: { span: 12 }, }, - $registrationCapital: { - grid: { span: 12 } + $roadImg: { + grid: { span: 4 }, + class: 'setCustom' }, - $unit: { - spanLabelFixed: 20, - grid: { span: 3 } - } + }; } // 道路运输证识别 checkTransCard(imgurl: any) { const params = { - transportationLicenseUrl: imgurl + transportationLicenseUrl: imgurl, }; - this.service.request(this.service.$api_recognizeTransportationLicense, params).subscribe(res => { + this.service.request(this.service.$api_recognizeTransportationLicense, params).subscribe((res: any) => { if (res) { this.sf.setValue('/roadTransportNo', res.number); this.sf.setValue('/roadTransportLicenceNo', res.businessCertificate); this.sf.setValue('/roadTransportStartTime', res.issueDate); - if (this.carNo === '') { - this.carNo = res.number; - } else if (this.carNo && res.vehicleNumber.indexOf(this.carNo) === -1) { - this.service.msgSrv.warning('请上传同一认证车辆的相关证件'); + if(this.carNo === '') { + this.carNo = res.number + } else if(this.carNo && res.vehicleNumber.indexOf(this.carNo) === -1) { + this.service.msgSrv.warning('请上传同一认证车辆的相关证件') } } }); @@ -590,12 +605,11 @@ export class CarSettleCarauthComponent implements OnInit { checkCarCard(imgurl: any, side: any) { const params = { vehicleLicenseUrl: imgurl, - side + side, }; - this.service.request(this.service.$api_recognizeVehicleLicense, params).subscribe(res => { + this.service.request(this.service.$api_recognizeVehicleLicense, params).subscribe((res: any) => { if (res) { - if (side === 'front') { - // 正面 + if (side === 'front') { // 正面 this.sf.setValue('/driverLicenseRegisterTime', res.registerDate); this.sf.setValue('/carNo', res.number); this.sf.setValue('/driverLicenseGetTime', res.issueDate); @@ -603,49 +617,46 @@ export class CarSettleCarauthComponent implements OnInit { this.sf.setValue('/carDistinguishCode', res.vin); this.sf.setValue('/carOwner', res.name); this.sf.setValue('/useNature', res.useCharacter === '非营运' ? 0 : 1); + } else { this.sf.setValue('/curbWeight', res.unladenMass); } - if (this.carNo === '') { - this.carNo = res.number; - } else if (this.carNo && this.carNo !== res.number) { - this.service.msgSrv.warning('请上传同一认证车辆的相关证件'); + if(this.carNo === '') { + this.carNo = res.number + } else if(this.carNo && this.carNo !== res.number) { + this.service.msgSrv.warning('请上传同一认证车辆的相关证件') } } }); } close(): void { - this.modal.destroy(); + this.modal.close(true); } showExample() { - this.showCardFlag = !this.showCardFlag; + this.showCardFlag = !this.showCardFlag } showJopExample() { - this.showJopFlag = !this.showJopFlag; + this.showJopFlag = !this.showJopFlag } submitForm() { const params: any = { appUserId: this.i.appUserId, - ...this.sf.value + ...this.sf.value, + bindType: this.i.bindType }; - params.carFrontPhoto = this.detailData.carFrontPhoto; - params.carProtocal = this.detailData.carProtocal; - params.certificatePhotoFront = this.detailData.certificatePhotoFront; - params.certificatePhotoBack = this.detailData.certificatePhotoBack; - params.roadTransportPhoto = this.detailData.roadTransportPhoto; - params.carFrontPhotoWatermark = this.sf.value.carFrontPhotoWatermark?.data?.fullFilePath || this.sf.value.carFrontPhotoWatermark - params.carProtocalWatermark = this.sf.value.carProtocalWatermark?.data?.fullFilePath || this.sf.value.carProtocalWatermark - params.certificatePhotoBackWatermark = this.sf.value.certificatePhotoBackWatermark?.data?.fullFilePath || this.sf.value.certificatePhotoBackWatermark - params.certificatePhotoFrontWatermark = this.sf.value.certificatePhotoFrontWatermark?.data?.fullFilePath || this.sf.value.certificatePhotoFrontWatermark - params.roadTransportPhotoWatermark = this.sf.value.roadTransportPhotoWatermark?.data?.fullFilePath || this.sf.value.roadTransportPhotoWatermark - delete params.titleA; - delete params.titleB; - this.service.request(this.service.$api_addOrUpdateCarLicenseInfo, params).subscribe(res => { + params.carFrontPhoto = this.detailData.carFrontPhoto + params.carProtocal = this.detailData.carProtocal + params.certificatePhotoFront = this.detailData.certificatePhotoFront + params.certificatePhotoBack = this.detailData.certificatePhotoBack + params.roadTransportPhoto = this.detailData.roadTransportPhoto + delete params.titleA + delete params.titleB + this.service.request(this.service.$api_saveUpdateShipperCar, params).subscribe((res: any) => { if (res) { - this.service.msgSrv.success('添加成功'); - this.modal.close(true); + this.service.msgSrv.success('添加成功') + this.modal.close(true) } - }); + }) } } From 2f9ce76435a6c5f4f2aadec7be6677df56a816f1 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 25 Mar 2022 16:33:00 +0800 Subject: [PATCH 76/99] fix bug --- .../components/bulk/bulk.component.html | 8 ++++---- .../waybill-management/components/bulk/bulk.component.ts | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/app/routes/waybill-management/components/bulk/bulk.component.html b/src/app/routes/waybill-management/components/bulk/bulk.component.html index 0e381f1e..851fa149 100644 --- a/src/app/routes/waybill-management/components/bulk/bulk.component.html +++ b/src/app/routes/waybill-management/components/bulk/bulk.component.html @@ -1,7 +1,7 @@ @@ -86,7 +86,7 @@ {{ item?.resourceCode }}
{{ item?.resourceTypeLabel }}{{ item?.serviceTypeLabel }}
-
{{ item?.resourceStatusLabel }}
+
{{ item?.resourceStatusLabel === '已完成' ? '已完结' : item?.resourceStatusLabel }}
 From 27df213f2bb4f4d1a223583e9404796d863e6f93 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Fri, 25 Mar 2022 17:24:19 +0800 Subject: [PATCH 80/99] edit --- .../add-etp-partner.component.html | 8 +- .../add-etp-partner.component.ts | 78 ++++++++++++++++++- .../add-personal-partner.component.html | 13 +++- .../add-personal-partner.component.ts | 78 ++++++++++++++++++- .../index/partner-list.component.ts | 18 ++--- .../partner-detail.component.html | 7 +- .../personal-partner-detail.component.html | 2 +- .../services/partner-list.service.ts | 2 + 8 files changed, 185 insertions(+), 21 deletions(-) diff --git a/src/app/routes/partner/partner-list/components/add-etp-partner/add-etp-partner.component.html b/src/app/routes/partner/partner-list/components/add-etp-partner/add-etp-partner.component.html index 4df4ab9b..bd95c61e 100644 --- a/src/app/routes/partner/partner-list/components/add-etp-partner/add-etp-partner.component.html +++ b/src/app/routes/partner/partner-list/components/add-etp-partner/add-etp-partner.component.html @@ -1,4 +1,10 @@ - + + + + + diff --git a/src/app/routes/partner/partner-list/components/add-etp-partner/add-etp-partner.component.ts b/src/app/routes/partner/partner-list/components/add-etp-partner/add-etp-partner.component.ts index 8ad008d2..14efa97f 100644 --- a/src/app/routes/partner/partner-list/components/add-etp-partner/add-etp-partner.component.ts +++ b/src/app/routes/partner/partner-list/components/add-etp-partner/add-etp-partner.component.ts @@ -11,7 +11,7 @@ import { } from '@delon/form'; import { NzTreeNode } from 'ng-zorro-antd/tree'; import { NzUploadFile } from 'ng-zorro-antd/upload'; -import { of } from 'rxjs'; +import { of, Subscription } from 'rxjs'; import { map } from 'rxjs/operators'; import { PartnerListService } from '../../services/partner-list.service'; @@ -64,6 +64,9 @@ export class AddEtpPartnerComponent { } }; + getIdentityInfoSub = new Subscription(); + loadingIdentityInfoSub = false; + constructor(public service: PartnerListService) {} submitForm() { @@ -426,7 +429,28 @@ export class AddEtpPartnerComponent { ui: { grid: { xxl: 13, xl: 18, lg: 24, md: 24 }, placeholder: '请输入企业管理员手机号', - errors: { required: '请输入企业管理员手机号', format: '手机号格式错误' } + errors: { required: '请输入企业管理员手机号', format: '手机号格式错误' }, + change: (mobile: any) => { + // 根据手机号获取实名信息 + if (mobile?.length === 11) { + if (this.loadingIdentityInfoSub) { + this.getIdentityInfoSub.unsubscribe(); + } + this.loadingIdentityInfoSub = true; + this.getIdentityInfoSub = this.service.request(this.service.$api_get_identityInfo_by_mobile, { mobile }).subscribe( + res => { + if (res) { + this.setInfo(res); + this.sf.setValue('/adminUserInfo/id', res.id); + this.sf.setValue('/adminUserInfo/userId', res.userId); + } + this.loadingIdentityInfoSub = false; + }, + _ => {}, + () => (this.loadingIdentityInfoSub = false) + ); + } + } } }, // 企业管理员信息 @@ -441,6 +465,8 @@ export class AddEtpPartnerComponent { }, default: true }, + id: { title: '', type: 'string', ui: { hidden: true } }, + userId: { title: '', type: 'string', ui: { hidden: true } }, certificatePhotoFront: { title: '', type: 'string', ui: { hidden: true } }, certificatePhotoBack: { title: '', type: 'string', ui: { hidden: true } }, certificatePhotoFrontWatermark: { @@ -589,4 +615,52 @@ export class AddEtpPartnerComponent { ] }; } + + private setInfo(info: any) { + if (info.name) { + this.sf.setValue('/adminUserInfo/name', info.name); + } + if (info.certificatePhotoFront) { + this.sf.setValue('/adminUserInfo/certificatePhotoFront', info.certificatePhotoFront); + } + if (info.certificatePhotoFrontWatermark) { + console.log(this.sf.getProperty('/adminUserInfo/certificatePhotoFrontWatermark')); + + this.sf.setValue('/adminUserInfo/certificatePhotoFrontWatermark', [ + { + uid: -1, + name: '文件', + status: 'done', + url: info.certificatePhotoFrontWatermark, + response: info.certificatePhotoFrontWatermark + } + ]); + } + if (info.certificatePhotoBack) { + this.sf.setValue('/adminUserInfo/certificatePhotoBack', info.certificatePhotoBack); + } + if (info.certificatePhotoBackWatermark) { + this.sf.setValue('/adminUserInfo/certificatePhotoBackWatermark', [ + { + uid: -1, + name: '文件', + status: 'done', + url: info.certificatePhotoBackWatermark, + response: info.certificatePhotoBackWatermark + } + ]); + } + if (info.certificateNumber) { + this.sf.setValue('/adminUserInfo/certificateNumber', info.certificateNumber); + } + if (info.validStartTime) { + this.sf.setValue('/adminUserInfo/validStartTime', info.validStartTime); + } + if (info.validEndTime) { + this.sf.setValue('/adminUserInfo/validEndTime', info.validEndTime); + this.sf.setValue('/adminUserInfo/_isLoingDate', false); + } else { + this.sf.setValue('/adminUserInfo/_isLoingDate', true); + } + } } diff --git a/src/app/routes/partner/partner-list/components/add-personal-partner/add-personal-partner.component.html b/src/app/routes/partner/partner-list/components/add-personal-partner/add-personal-partner.component.html index cb94b51b..7a071adc 100644 --- a/src/app/routes/partner/partner-list/components/add-personal-partner/add-personal-partner.component.html +++ b/src/app/routes/partner/partner-list/components/add-personal-partner/add-personal-partner.component.html @@ -1,4 +1,10 @@ - + + + + + @@ -36,7 +42,8 @@
- +
- + \ No newline at end of file diff --git a/src/app/routes/partner/partner-list/components/add-personal-partner/add-personal-partner.component.ts b/src/app/routes/partner/partner-list/components/add-personal-partner/add-personal-partner.component.ts index eca02366..d21416e3 100644 --- a/src/app/routes/partner/partner-list/components/add-personal-partner/add-personal-partner.component.ts +++ b/src/app/routes/partner/partner-list/components/add-personal-partner/add-personal-partner.component.ts @@ -12,7 +12,7 @@ import { } from '@delon/form'; import { NzTreeNode } from 'ng-zorro-antd/tree'; import { NzUploadFile } from 'ng-zorro-antd/upload'; -import { of } from 'rxjs'; +import { of, Subscription } from 'rxjs'; import { map } from 'rxjs/operators'; import { PartnerListService } from '../../services/partner-list.service'; @@ -65,6 +65,9 @@ export class AddPersonalPartnerComponent { } }; + getIdentityInfoSub = new Subscription(); + loadingIdentityInfoSub = false; + constructor(private router: Router, public service: PartnerListService) {} submitForm() { @@ -156,7 +159,28 @@ export class AddPersonalPartnerComponent { ui: { grid: { xxl: 13, xl: 18, lg: 24, md: 24 }, placeholder: '请输入手机号', - errors: { required: '请输入手机号', format: '手机号格式错误' } + errors: { required: '请输入手机号', format: '手机号格式错误' }, + change: (mobile: any) => { + // 根据手机号获取实名信息 + if (mobile?.length === 11) { + if (this.loadingIdentityInfoSub) { + this.getIdentityInfoSub.unsubscribe(); + } + this.loadingIdentityInfoSub = true; + this.getIdentityInfoSub = this.service.request(this.service.$api_get_identityInfo_by_mobile, { mobile }).subscribe( + res => { + if (res) { + this.setInfo(res); + this.sf.setValue('/adminUserInfo/id', res.id); + this.sf.setValue('/adminUserInfo/userId', res.userId); + } + this.loadingIdentityInfoSub = false; + }, + _ => {}, + () => (this.loadingIdentityInfoSub = false) + ); + } + } } }, // 合伙人信息 @@ -172,6 +196,8 @@ export class AddPersonalPartnerComponent { default: true }, certificatePhotoFront: { title: '', type: 'string', ui: { hidden: true } }, + id: { title: '', type: 'string', ui: { hidden: true } }, + userId: { title: '', type: 'string', ui: { hidden: true } }, certificatePhotoBack: { title: '', type: 'string', ui: { hidden: true } }, certificateType: { title: '', type: 'string', ui: { hidden: true }, default: 0 }, certificatePhotoFrontWatermark: { @@ -311,4 +337,52 @@ export class AddPersonalPartnerComponent { required: ['cityCodesList', 'invitationCode'] }; } + + private setInfo(info: any) { + if (info.name) { + this.sf.setValue('/adminUserInfo/name', info.name); + } + if (info.certificatePhotoFront) { + this.sf.setValue('/adminUserInfo/certificatePhotoFront', info.certificatePhotoFront); + } + if (info.certificatePhotoFrontWatermark) { + console.log(this.sf.getProperty('/adminUserInfo/certificatePhotoFrontWatermark')); + + this.sf.setValue('/adminUserInfo/certificatePhotoFrontWatermark', [ + { + uid: -1, + name: '文件', + status: 'done', + url: info.certificatePhotoFrontWatermark, + response: info.certificatePhotoFrontWatermark + } + ]); + } + if (info.certificatePhotoBack) { + this.sf.setValue('/adminUserInfo/certificatePhotoBack', info.certificatePhotoBack); + } + if (info.certificatePhotoBackWatermark) { + this.sf.setValue('/adminUserInfo/certificatePhotoBackWatermark', [ + { + uid: -1, + name: '文件', + status: 'done', + url: info.certificatePhotoBackWatermark, + response: info.certificatePhotoBackWatermark + } + ]); + } + if (info.certificateNumber) { + this.sf.setValue('/adminUserInfo/certificateNumber', info.certificateNumber); + } + if (info.validStartTime) { + this.sf.setValue('/adminUserInfo/validStartTime', info.validStartTime); + } + if (info.validEndTime) { + this.sf.setValue('/adminUserInfo/validEndTime', info.validEndTime); + this.sf.setValue('/adminUserInfo/_isLoingDate', false); + } else { + this.sf.setValue('/adminUserInfo/_isLoingDate', true); + } + } } diff --git a/src/app/routes/partner/partner-list/components/index/partner-list.component.ts b/src/app/routes/partner/partner-list/components/index/partner-list.component.ts index 68703251..2e47723a 100644 --- a/src/app/routes/partner/partner-list/components/index/partner-list.component.ts +++ b/src/app/routes/partner/partner-list/components/index/partner-list.component.ts @@ -367,12 +367,12 @@ export class PartnerListComponent { }, { title: '付款编码', index: 'payCode', width: 160 }, { title: '邀请码', index: 'invitationCode', className: 'text-center', width: 130 }, - { title: '企业管理员', index: 'contactName', width: 150 }, + { title: '企业管理员', index: 'contactName', width: 150, format: item => (item.partnerType ? `${item.contactName}` : '') }, { title: '手机号', index: 'contactMobile', className: 'text-center', width: 150 }, { title: '类型', index: 'partnerType', className: 'text-center', width: 130, type: 'enum', enum: { 1: '企业', 2: '个人' } }, { title: '注册渠道', index: 'source', type: 'enum', enum: { 1: '合伙人注册', 2: '平台添加' }, width: 130 }, { title: '注册时间', index: 'createTime', className: 'text-center', width: 170 }, - { title: '渠道销售', index: 'channelId', width: 170 }, + { title: '渠道销售', index: 'channelIdLabel', width: 170 }, { title: '返佣模板', index: 'templateName', width: 150 }, { title: '认证审核状态', @@ -380,7 +380,7 @@ export class PartnerListComponent { width: 150, type: 'badge', badge: { - 0: { text: '草稿', color: 'default' }, + '-1': { text: '未提交', color: 'default' }, 10: { text: '待审核', color: 'processing' }, 20: { text: '审核通过', color: 'success' }, 30: { text: '驳回', color: 'error' } @@ -428,7 +428,12 @@ export class PartnerListComponent { buttons: [ { type: 'divider' }, { - text: '详情', + text: '审核', + iif: item => item.id && item.approvalStatus === 10, + click: item => this.auditPartner(item) + }, + { + text: '详情
', iif: item => item.id, click: item => { if (item.partnerType === 1) { @@ -438,11 +443,6 @@ export class PartnerListComponent { } } }, - { - text: '审核
', - iif: item => item.id, - click: item => this.auditPartner(item) - }, { text: '修改返佣模板', iif: item => item.id, diff --git a/src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.html b/src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.html index 98adf913..c4abbd48 100644 --- a/src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.html +++ b/src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.html @@ -40,7 +40,7 @@ - + @@ -87,8 +87,9 @@ [nzBorderless]="!isEdit" [placeholder]="isEdit ? '' : '-'" /> - + + {{detailData.adminUserInfo.mobile}} 保存 - + diff --git a/src/app/routes/partner/partner-list/services/partner-list.service.ts b/src/app/routes/partner/partner-list/services/partner-list.service.ts index 1abc97f9..5a00d758 100644 --- a/src/app/routes/partner/partner-list/services/partner-list.service.ts +++ b/src/app/routes/partner/partner-list/services/partner-list.service.ts @@ -33,6 +33,8 @@ export class PartnerListService extends ShipperBaseService { $api_get_enterprice_rel_list = '/api/mdc/EnterpriseRelLog/list'; // 校验合伙人是否可修改渠道销售 true:可以修改 false：不可以修改 $api_check_partenr_change_channel = '/api/mdc/partner/updateChannelCheck'; + // 根据手机号查询实名信息 + $api_get_identityInfo_by_mobile= '/api/mdc/cuc/identityInfo/getByMobile'; // 渠道销售修改详情 $api_get_partner_change_list = '/api/mdc/partnerChannelRelLog/partnerChannelUpdateDetaiList'; // 冻结/启用企业业 From c00d41c25ea4b8f685f91cc289a8703c48975037 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Fri, 25 Mar 2022 17:32:57 +0800 Subject: [PATCH 81/99] edit --- proxy.conf.js | 2 +- .../invoice-requested-detail.component.html | 10 +++++----- .../invoice-requested/invoice-requested.component.ts | 2 +- .../requested-detail/requested-detail.component.html | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/proxy.conf.js b/proxy.conf.js index 10071e14..67c15ee2 100644 --- a/proxy.conf.js +++ b/proxy.conf.js @@ -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/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.html b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.html index 3a5ab163..14f0808f 100644 --- a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.html +++ b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.html @@ -19,13 +19,13 @@ {{headerInfo?.vatinvHNum}} / {{headerInfo?.vatinvBillNum}} - {{headerInfo?.vatinvHAmount}} / {{headerInfo?.vatinvHNumAmount}} + {{headerInfo?.vatinvHAmount |currency}} / {{headerInfo?.vatinvHNumAmount |currency}} {{headerInfo?.vatinvHNum}} - {{headerInfo?.reciname}} + {{headerInfo?.reciname}} {{headerInfo?.provinceName}}{{headerInfo?.cityName}}{{headerInfo?.areaName}}{{headerInfo?.reciaddr}} @@ -101,13 +101,13 @@ 已选择 {{ selectedRows.length }} 条数据   开票金额总计 {{ - totalCallNo }} + totalCallNo |currency }} 清空 - {{ item.billHCode }} diff --git a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts index 45af1277..d399540a 100644 --- a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts +++ b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts @@ -244,7 +244,7 @@ export class InvoiceRequestedComponent { requestedInvoiceAction(item: any) { const modal = this.nzModalService.create({ - nzTitle: '开票', + nzTitle: '开票受理', nzContent: RequestedInvoiceModalComponent, nzWidth: 1200, nzComponentParams: { diff --git a/src/app/routes/ticket-management/components/invoice-requested/requested-detail/requested-detail.component.html b/src/app/routes/ticket-management/components/invoice-requested/requested-detail/requested-detail.component.html index 40730c41..737e5eef 100644 --- a/src/app/routes/ticket-management/components/invoice-requested/requested-detail/requested-detail.component.html +++ b/src/app/routes/ticket-management/components/invoice-requested/requested-detail/requested-detail.component.html @@ -38,7 +38,7 @@ {{headerInfo?.ordlines}} - {{headerInfo?.vatinvHNumAmount}} + {{headerInfo?.vatinvHNumAmount | currency}} {{headerInfo?.vatnameLabel}} From 07638e9ee21ba0a7cb42bb66feff4f141ff56582 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Fri, 25 Mar 2022 17:44:53 +0800 Subject: [PATCH 82/99] edit --- .../advance-collection.component.ts | 6 ++-- .../receipt-order/receipt-order.component.ts | 6 ++-- .../receivable-order.component.ts | 6 ++-- .../cancellation-invoice.component.ts | 13 +++++--- .../invoice-requested.component.ts | 8 +++-- .../requested-detail.component.ts | 2 -- .../services/business/shipper-base.service.ts | 30 +++++++++++++++++++ 7 files changed, 56 insertions(+), 15 deletions(-) diff --git a/src/app/routes/financial-management/components/advance-collection/advance-collection.component.ts b/src/app/routes/financial-management/components/advance-collection/advance-collection.component.ts index 3556e2d5..57a658a1 100644 --- a/src/app/routes/financial-management/components/advance-collection/advance-collection.component.ts +++ b/src/app/routes/financial-management/components/advance-collection/advance-collection.component.ts @@ -84,9 +84,11 @@ export class AdvanceCollectionComponent { title: '付款人', ui: { widget: 'select', - placeholder: '请选择', + serverSearch: true, + searchDebounceTime: 300, + searchLoadingText: '搜索中...', allowClear: true, - asyncData: () => this.service.getCRM() + onSearch: (q: any) => this.service.getEnterpriceList({ enterpriseName: q }) } }, brmtype: { 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 c356eb36..820d90b9 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 @@ -151,9 +151,11 @@ export class ReceiptOrderComponent implements OnInit { title: '付款人', ui: { widget: 'select', - placeholder: '请选择', + serverSearch: true, + searchDebounceTime: 300, + searchLoadingText: '搜索中...', allowClear: true, - asyncData: () => this.service.getCRM(), + onSearch: (q: any) => this.service.getEnterpriceList({ enterpriseName: q }), visibleIf: { expand: (value: boolean) => value } 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 590aa5fe..f0fb02d9 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 @@ -158,9 +158,11 @@ export class ReceivableOrderComponent implements OnInit { title: '付款人', ui: { widget: 'select', - placeholder: '请选择', + serverSearch: true, + searchDebounceTime: 300, + searchLoadingText: '搜索中...', allowClear: true, - asyncData: () => this.service.getCRM(), + onSearch: (q: any) => this.service.getEnterpriceList({ enterpriseName: q }), visibleIf: { expand: (value: boolean) => value } 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 e2e9009e..c9183bf2 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 @@ -2,9 +2,11 @@ import { CurrencyPipe } from '@angular/common'; import { Component, OnInit, ViewChild } from '@angular/core'; import { Router } from '@angular/router'; import { STComponent, STColumn, STRequestOptions, STChange } from '@delon/abc/st'; -import { SFComponent, SFSchema, SFDateWidgetSchema, SFSelectWidgetSchema } from '@delon/form'; +import { SFComponent, SFSchema, SFDateWidgetSchema, SFSelectWidgetSchema, SFSchemaEnum } from '@delon/form'; import { dateTimePickerUtil } from '@delon/util'; import { NzModalService } from 'ng-zorro-antd/modal'; +import { of } from 'rxjs'; +import { map } from 'rxjs/operators'; import { TicketService } from '../../services/ticket.service'; import { RequestedInvoiceModalComponent } from '../invoice-requested/requested-invoice-modal/requested-invoice-modal.component'; import { PushInvoiceComponent } from './push-invoice/push-invoice.component'; @@ -257,13 +259,16 @@ export class CancellationInvoiceComponent implements OnInit { placeholder: '请输入' } }, - receiveName2: { + arto: { type: 'string', title: '购买人', - enum: [{ label: '全部', value: '全部' }], ui: { widget: 'select', - placeholder: '请选择' + serverSearch: true, + searchDebounceTime: 300, + searchLoadingText: '搜索中...', + allowClear: true, + onSearch: (q: any) => this.service.getEnterpriceList({ enterpriseName: q }) } }, ltdId: { diff --git a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts index d399540a..0da10fe3 100644 --- a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts +++ b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts @@ -385,12 +385,14 @@ export class InvoiceRequestedComponent { title: '货主名称', ui: { widget: 'select', - placeholder: '请选择', + serverSearch: true, + searchDebounceTime: 300, + searchLoadingText: '搜索中...', allowClear: true, + onSearch: (q: any) => this.service.getEnterpriceList({ enterpriseName: q }), visibleIf: { expand: (value: boolean) => value - }, - asyncData: () => this.service.getCRM() + } } } } diff --git a/src/app/routes/ticket-management/components/invoice-requested/requested-detail/requested-detail.component.ts b/src/app/routes/ticket-management/components/invoice-requested/requested-detail/requested-detail.component.ts index 8fa4924e..675783d0 100644 --- a/src/app/routes/ticket-management/components/invoice-requested/requested-detail/requested-detail.component.ts +++ b/src/app/routes/ticket-management/components/invoice-requested/requested-detail/requested-detail.component.ts @@ -32,7 +32,6 @@ export class RequestedDetailComponent implements OnInit { initData() { if(this.id) { this.service.request(this.service.$api_get_invoice_requested_header_detail, { id: this.id }).subscribe(res => { - console.log(res); if (res) { this.headerInfo = res; } @@ -40,7 +39,6 @@ export class RequestedDetailComponent implements OnInit { } if(this.Id) { this.service.request(this.service.$api_get_invoice_requested_header_detail, { id: this.Id }).subscribe(res => { - console.log(res); if (res) { this.headerInfo = res; } diff --git a/src/app/shared/services/business/shipper-base.service.ts b/src/app/shared/services/business/shipper-base.service.ts index 381791a4..045ca354 100644 --- a/src/app/shared/services/business/shipper-base.service.ts +++ b/src/app/shared/services/business/shipper-base.service.ts @@ -23,6 +23,9 @@ export class ShipperBaseService extends BaseService { $api_get_rebate_config = `/api/mdc/rebateConfig/list/listRebateConfig`; // 获取渠道销售管理集合 $api_get_channel = `/api/mdc/channelSalesManagement/list/listChannelSalesManagement`; + + // 获取货主企业列表 + public $api_enterpriceList = '/api/mdc/cuc/enterpriseInfo/operate/enterpriceList'; constructor(public injector: Injector) { super(injector); } @@ -166,6 +169,33 @@ export class ShipperBaseService extends BaseService { ); } + /** + * 获取货主企业列表 + * @returns + */ + getEnterpriceList(params = { enterpriseName: '' }, containerAll = false) { + let str = params.enterpriseName.replace(/^\s+|\s+$/g, ''); + if (str) { + return this.request(this.$api_enterpriceList, params).pipe( + map((res: any) => { + if (!res) { + return []; + } + const list = res.map((item: any) => { + return { label: item.enterpriseName, value: item.id }; + }); + const obj = []; + if (containerAll) { + obj.push({ label: '全部', value: '' }); + } + return [...obj, ...list]; + }) + ).toPromise();; + } else { + return of([]); + } + } + /** * 获取结算客户 * @returns From 64f178c81cf9b657cc2d550f48e189e1d33657ca Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 25 Mar 2022 18:06:02 +0800 Subject: [PATCH 83/99] fix bug --- .../components/vehicle/vehicle.component.ts | 2 +- .../driver/detail/detail.component.ts | 24 ++++++++++++------- 2 files changed, 17 insertions(+), 9 deletions(-) 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 92a29c7c..22bdb5c3 100644 --- a/src/app/routes/order-management/components/vehicle/vehicle.component.ts +++ b/src/app/routes/order-management/components/vehicle/vehicle.component.ts @@ -450,7 +450,7 @@ export class OrderManagementVehicleComponent extends BasicTableComponent impleme { text: '取消订单', click: _record => this.cancellation(_record), - iif: item => item.billStatus !== '1' && item.billStatus !== '6' && item.overallPaymentStatus !== '2', + iif: item => item.billStatus !== '6' && item.overallPaymentStatus !== '2', acl: { ability: ['ORDER-VEHICLE-cancelAnOrder'] } }, { diff --git a/src/app/routes/usercenter/components/driver/detail/detail.component.ts b/src/app/routes/usercenter/components/driver/detail/detail.component.ts index 98c51cc2..6dcce146 100644 --- a/src/app/routes/usercenter/components/driver/detail/detail.component.ts +++ b/src/app/routes/usercenter/components/driver/detail/detail.component.ts @@ -8,8 +8,10 @@ import { ModalHelper, _HttpClient } from '@delon/theme'; import { NzImageService } from 'ng-zorro-antd/image'; import { NzMessageService } from 'ng-zorro-antd/message'; import { NzModalService } from 'ng-zorro-antd/modal'; +import { Subject } from 'rxjs'; import { ImageViewComponent } from 'src/app/shared/components/imagelist'; import { UsermanageService } from '../../../services/usercenter.service'; +import { debounceTime } from 'rxjs/operators'; @Component({ selector: 'app-usercenter-components-driver-detail', @@ -21,6 +23,7 @@ export class UserCenterComponentsDriverDetailComponent implements OnInit { detailData: any; userDetail: any; contencarModel: any; + changeSub = new Subject(); facetext: any; faceStatus: any = 0; userIdentityDetail: any = {}; @@ -73,6 +76,7 @@ export class UserCenterComponentsDriverDetailComponent implements OnInit { ngOnInit() { this.initData(); this.initDetailByCode(); + this.changeEndKmAction() } initData() { // 获取司机头部信息 @@ -209,17 +213,21 @@ export class UserCenterComponentsDriverDetailComponent implements OnInit { nzTitle: '审核通过', nzContent: `

驾驶证号：${this.driverDetail?.licenseNo}

从业资格证号：${this.licenseDetail?.licenseNo}

是否确认通过审核`, nzOnOk: () => { - this.adjuctDriverLicense( - { - approvalStatus: 20, - appUserId: this.userDetail?.appUserId - }, - '审核成功' - ); + this.changeEndKmAction() } }); } - + changeEndKmAction() { + this.changeSub.pipe(debounceTime(500)).subscribe((res: string) => { + this.adjuctDriverLicense( + { + approvalStatus: 20, + appUserId: this.userDetail?.appUserId + }, + '审核成功' + ); + }) + } /** 驳回驾驶员信息 */ rejectedDriver() { this.approvalOpinion = ''; From 75db016c07863b1a3684bc8bd1353568a14bef0b Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Mon, 28 Mar 2022 09:15:15 +0800 Subject: [PATCH 84/99] edit --- .../components/invoice-requested/invoice-requested.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts index 0da10fe3..a21104a4 100644 --- a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts +++ b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts @@ -133,7 +133,7 @@ export class InvoiceRequestedComponent { this.service .request(this.service.$api_update_invoice_address, { ...component.sf.value, - id: item.map(i => i.id) + ids: item.map(i => i.id) }) .subscribe(res => { if (res) { From 3de3f4dd35b694e890c3b5e7e99d4ddd7c1e4e62 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Mon, 28 Mar 2022 09:35:32 +0800 Subject: [PATCH 85/99] edit --- .../receivable-order-detail.component.html | 4 ++-- .../components/receivable-order/receivable-order.component.ts | 2 +- .../cancellation-invoice/cancellation-invoice.component.html | 2 +- .../cancellation-invoice/cancellation-invoice.component.ts | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/app/routes/financial-management/components/receivable-order/receivable-order-detail/receivable-order-detail.component.html b/src/app/routes/financial-management/components/receivable-order/receivable-order-detail/receivable-order-detail.component.html index 117b7972..9a87db0d 100644 --- a/src/app/routes/financial-management/components/receivable-order/receivable-order-detail/receivable-order-detail.component.html +++ b/src/app/routes/financial-management/components/receivable-order/receivable-order-detail/receivable-order-detail.component.html @@ -29,9 +29,9 @@ {{headerInfo?.artoname}} - + {{headerInfo?.armoney | currency}} 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 f0fb02d9..a8e78022 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 @@ -183,7 +183,7 @@ export class ReceivableOrderComponent implements OnInit { } } }, - bankType: { + banktype: { type: 'string', title: '银行类型', enum: [ diff --git a/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.html b/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.html index c2b8daca..c31db228 100644 --- a/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.html +++ b/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.html @@ -65,7 +65,7 @@

开户行： {{openInfo?.artobank}}

 - {{openInfo?.vatname}} + {{openInfo?.vatnameLable}} {{openInfo?.vatremarks}} 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 c9183bf2..be6850ef 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 @@ -285,7 +285,7 @@ export class CancellationInvoiceComponent implements OnInit { } }, sts: { - title: '结算依据', + title: '发票状态', type: 'string', ui: { widget: 'dict-select', From 3308386da5c37f4a4f71a561d1844bf28586b10a Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Mon, 28 Mar 2022 09:38:54 +0800 Subject: [PATCH 86/99] edit --- .../network-freight.component.ts | 87 ++++++++++--------- 1 file changed, 46 insertions(+), 41 deletions(-) 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 5456947b..a334b188 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 @@ -1,7 +1,15 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; import { STComponent, STColumn, STChange } from '@delon/abc/st'; -import { SFCascaderWidgetSchema, SFComponent, SFRadioWidgetSchema, SFSchema, SFSchemaEnum, SFSelectWidgetSchema, SFUISchema } from '@delon/form'; +import { + SFCascaderWidgetSchema, + SFComponent, + SFRadioWidgetSchema, + SFSchema, + SFSchemaEnum, + SFSelectWidgetSchema, + SFUISchema +} from '@delon/form'; import { DynamicSettingModalComponent, SinglepageSettingModalComponent } from '@shared'; import { NzModalService } from 'ng-zorro-antd/modal'; import { of } from 'rxjs'; @@ -32,10 +40,10 @@ export class NetworkFreightComponent implements OnInit { ticketSchema: SFSchema = {}; TaxSchema: SFSchema = {}; NCSchema: SFSchema = {}; - _$expand :boolean= false; - taxStatus :boolean= false; - TicketStatus :boolean= true; - NCStatus :boolean = false; + _$expand: boolean = false; + taxStatus: boolean = false; + TicketStatus: boolean = true; + NCStatus: boolean = false; formData: any; ticketId: any; ticketItem: any; @@ -117,29 +125,28 @@ export class NetworkFreightComponent implements OnInit { fixed: 'right', className: 'text-center', buttons: [ + { type: 'divider' }, { - text: '基础设置', + text: '基础设置
', click: item => this.creat(item) }, { - text: '财务设置', + text: '财务设置
', click: item => this.ticket(item) }, { - text: '充值账户', + text: '充值账户
', click: item => this.settingPay(item) }, { - text: '应用设置', + text: '应用设置
', click: item => this.settingApp(item) }, { - text: '系统配置', + text: '系统配置
', click: item => this.settingAction(item) }, - { type: 'divider' }, - // { // text: '合同设置', // click: item => this.roleAction(item, 2) @@ -337,9 +344,9 @@ export class NetworkFreightComponent implements OnInit { 'drawer' ] }; - this.ui3 = { - '*': { spanLabelFixed: 150, grid: { span: 24 } }, - '$taxClassificationVersion': { spanLabelFixed: 150, grid: { span: 24 } }, + this.ui3 = { + '*': { spanLabelFixed: 150, grid: { span: 24 } }, + $taxClassificationVersion: { spanLabelFixed: 150, grid: { span: 24 } } }; } initSFTax() { @@ -377,7 +384,7 @@ export class NetworkFreightComponent implements OnInit { let str = q.replace(/^\s+|\s+$/g, ''); if (str) { console.log(str); - + return this.service .request(this.service.$api_get_crmCustomer_page, { customerName: str }) .pipe(map((res: any) => (res.records as any[]).map(i => ({ label: i.customerName, value: i.id } as SFSchemaEnum)))) @@ -387,12 +394,11 @@ export class NetworkFreightComponent implements OnInit { } } } as SFSelectWidgetSchema - }, + } }, required: ['crmCustomerId'] }; this.ui5 = { '*': { spanLabelFixed: 120, grid: { span: 24 } } }; - } initSFFre() { this.addSchema = { @@ -444,16 +450,16 @@ export class NetworkFreightComponent implements OnInit { this.formDataNC = []; this.formDataTax = []; this.ticketItem = value; - this.taxStatus = false - this.TicketStatus = true - this.NCStatus = false + this.taxStatus = false; + this.TicketStatus = true; + this.NCStatus = false; this.initSFTax(); this.initSFNC(); this.initSFTicket(); this.NCID = value.id; - if(this.TicketStatus) { + if (this.TicketStatus) { console.log('9999999'); - + this.service.request(this.service.$api_getTicketByNetworkTransporterId, { id: value.id }).subscribe((res: any) => { console.log(res); if (res) { @@ -466,8 +472,8 @@ export class NetworkFreightComponent implements OnInit { } }); } - if(this.NCStatus) { - this.getNcSetData() + if (this.NCStatus) { + this.getNcSetData(); } this.isVisibleTicket = true; } @@ -477,12 +483,12 @@ export class NetworkFreightComponent implements OnInit { this.service.request(this.service.$api_get_crmCustomer, { id: this.ticketItem.crmCustomerId }).subscribe((res: any) => { console.log(res); if (res) { - List.push({ label: res.customerName, value: res.id }); - console.log(List); - - this.sfNC.getProperty('/crmCustomerId')!.schema.enum = List; - this.sfNC.getProperty('/crmCustomerId')!.widget.reset(List); - this.sfNC.setValue('/crmCustomerId', res?.id); + List.push({ label: res.customerName, value: res.id }); + console.log(List); + + this.sfNC.getProperty('/crmCustomerId')!.schema.enum = List; + this.sfNC.getProperty('/crmCustomerId')!.widget.reset(List); + this.sfNC.setValue('/crmCustomerId', res?.id); } }); } @@ -493,7 +499,7 @@ export class NetworkFreightComponent implements OnInit { regioin?.forEach((element: any) => { enterpriseAddressCode.push(Number(element)); }); - if(this.TicketStatus) { + if (this.TicketStatus) { this.sfTicket.setValue('/senderRegionCode', enterpriseAddressCode); return enterpriseAddressCode; } @@ -587,11 +593,11 @@ export class NetworkFreightComponent implements OnInit { this.isVisibleTicket = false; } handleOKTicket() { - console.log( this.taxStatus, this.TicketStatus,this.NCStatus); - if(this.TicketStatus) { + console.log(this.taxStatus, this.TicketStatus, this.NCStatus); + if (this.TicketStatus) { console.log(this.sfTicket); console.log(this.sfTicket.value); - + if (!this.sfTicket.valid) { this.service.msgSrv.warning('请正确填写完整！'); return; @@ -611,11 +617,11 @@ export class NetworkFreightComponent implements OnInit { this.st.reload(1); } }); - } else if(this.NCStatus){ + } else if (this.NCStatus) { console.log(this.sfNC); console.log(this.formDataNC); console.log(this.sfNC?.value); - + if (!this.sfNC.valid) { this.service.msgSrv.warning('请正确填写完整！'); return; @@ -636,7 +642,6 @@ export class NetworkFreightComponent implements OnInit { }); // api_setCrmCustomer } - } handleOK() { @@ -674,12 +679,12 @@ export class NetworkFreightComponent implements OnInit { this.taxStatus = true; this.TicketStatus = false; this.NCStatus = false; - } else if (value.name === '开票设置'){ + } else if (value.name === '开票设置') { this.TicketStatus = true; this.NCStatus = false; this.taxStatus = false; - } else if (value.name === 'NC设置'){ - this.getNcSetData() + } else if (value.name === 'NC设置') { + this.getNcSetData(); this.NCStatus = true; this.TicketStatus = false; this.taxStatus = false; From 5693c85f30474f22fe9bbc9f0e59654e9ca0042a Mon Sep 17 00:00:00 2001 From: Lingzi Date: Mon, 28 Mar 2022 10:02:34 +0800 Subject: [PATCH 87/99] fix bug --- proxy.conf.js | 2 +- src/app/global-config.module.ts | 2 +- .../dataindex/dataindex.component.html | 32 ++++++++++++++++ .../dataindex/dataindex.component.less | 0 .../dataindex/dataindex.component.spec.ts | 24 ++++++++++++ .../dataindex/dataindex.component.ts | 37 +++++++++++++++++++ .../datatable/datatable-routing.module.ts | 13 +++++++ src/app/routes/datatable/datatable.module.ts | 17 +++++++++ src/app/routes/routes-routing.module.ts | 6 +-- .../list/showService/showservice.component.ts | 3 +- src/app/shared/shared-g2.module.ts | 4 +- 11 files changed, 133 insertions(+), 7 deletions(-) create mode 100644 src/app/routes/datatable/dataindex/dataindex.component.html create mode 100644 src/app/routes/datatable/dataindex/dataindex.component.less create mode 100644 src/app/routes/datatable/dataindex/dataindex.component.spec.ts create mode 100644 src/app/routes/datatable/dataindex/dataindex.component.ts create mode 100644 src/app/routes/datatable/datatable-routing.module.ts create mode 100644 src/app/routes/datatable/datatable.module.ts diff --git a/proxy.conf.js b/proxy.conf.js index 67c15ee2..10071e14 100644 --- a/proxy.conf.js +++ b/proxy.conf.js @@ -20,7 +20,7 @@ module.exports = { // } '//api': { target: { - host: 'tms-api-test.eascs.com', + host: 'tms-api-dev.eascs.com', protocol: 'https:', port: 443 }, diff --git a/src/app/global-config.module.ts b/src/app/global-config.module.ts index 856aede2..2d6bb8cd 100644 --- a/src/app/global-config.module.ts +++ b/src/app/global-config.module.ts @@ -27,7 +27,7 @@ const alainConfig: AlainConfig = { 'https://gw.alipayobjects.com/os/lib/antv/g2/4.1.4/dist/g2.min.js', 'https://gw.alipayobjects.com/os/lib/antv/data-set/0.11.7/dist/data-set.js' ] - } + }, }; const alainModules = [AlainThemeModule.forRoot(), DelonACLModule.forRoot()]; diff --git a/src/app/routes/datatable/dataindex/dataindex.component.html b/src/app/routes/datatable/dataindex/dataindex.component.html new file mode 100644 index 00000000..ffa275ac --- /dev/null +++ b/src/app/routes/datatable/dataindex/dataindex.component.html @@ -0,0 +1,32 @@ + + +
+
+ + + + + +
+
+ + + + + +
+
+ + + + + +
+
+ + + + + +
+
diff --git a/src/app/routes/datatable/dataindex/dataindex.component.less b/src/app/routes/datatable/dataindex/dataindex.component.less new file mode 100644 index 00000000..e69de29b diff --git a/src/app/routes/datatable/dataindex/dataindex.component.spec.ts b/src/app/routes/datatable/dataindex/dataindex.component.spec.ts new file mode 100644 index 00000000..cd009e56 --- /dev/null +++ b/src/app/routes/datatable/dataindex/dataindex.component.spec.ts @@ -0,0 +1,24 @@ +import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; +import { DatatableDataindexComponent } from './dataindex.component'; + +describe('DatatableDataindexComponent', () => { + let component: DatatableDataindexComponent; + let fixture: ComponentFixture; + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [ DatatableDataindexComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(DatatableDataindexComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/routes/datatable/dataindex/dataindex.component.ts b/src/app/routes/datatable/dataindex/dataindex.component.ts new file mode 100644 index 00000000..b180b8a5 --- /dev/null +++ b/src/app/routes/datatable/dataindex/dataindex.component.ts @@ -0,0 +1,37 @@ +import { Component, OnInit, ViewChild } from '@angular/core'; +import { ModalHelper, _HttpClient } from '@delon/theme'; +import { G2MiniAreaClickItem, G2MiniAreaData } from '@delon/chart/mini-area'; +import { format } from 'date-fns'; + +@Component({ + selector: 'app-datatable-dataindex', + templateUrl: './dataindex.component.html', + styleUrls: ['./dataindex.component.less'] +}) +export class DatatableDataindexComponent implements OnInit { + visitData = this.genData(); + + constructor(private http: _HttpClient, private modal: ModalHelper) { } + + ngOnInit(): void { } + private genData(): G2MiniAreaData[] { + const beginDay = new Date().getTime(); + const res: G2MiniAreaData[] = []; + for (let i = 0; i < 20; i += 1) { + res.push({ + x: format(new Date(beginDay + 1000 * 60 * 60 * 24 * i), 'yyyy-MM-dd'), + y: Math.floor(Math.random() * 100) + 10, + }); + } + return res; + } + + refresh(): void { + this.visitData = this.genData(); + } + + handleClick(data: G2MiniAreaClickItem): void { + //this.msg.info(`${data.item.x} - ${data.item.y}`); + } + +} diff --git a/src/app/routes/datatable/datatable-routing.module.ts b/src/app/routes/datatable/datatable-routing.module.ts new file mode 100644 index 00000000..76a62af8 --- /dev/null +++ b/src/app/routes/datatable/datatable-routing.module.ts @@ -0,0 +1,13 @@ +import { NgModule } from '@angular/core'; +import { RouterModule, Routes } from '@angular/router'; +import { DatatableDataindexComponent } from './dataindex/dataindex.component'; + +const routes: Routes = [ + + { path: 'dataindex', component: DatatableDataindexComponent }]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule] +}) +export class DatatableRoutingModule { } diff --git a/src/app/routes/datatable/datatable.module.ts b/src/app/routes/datatable/datatable.module.ts new file mode 100644 index 00000000..f996d3b5 --- /dev/null +++ b/src/app/routes/datatable/datatable.module.ts @@ -0,0 +1,17 @@ +import { NgModule, Type } from '@angular/core'; +import { SharedModule, SHARED_G2_MODULES } from '@shared'; +import { DatatableRoutingModule } from './datatable-routing.module'; +import { DatatableDataindexComponent } from './dataindex/dataindex.component'; + +const COMPONENTS: Type[] = [ + DatatableDataindexComponent]; + +@NgModule({ + imports: [ + SharedModule, + DatatableRoutingModule, + SHARED_G2_MODULES + ], + declarations: COMPONENTS, +}) +export class DatatableModule { } diff --git a/src/app/routes/routes-routing.module.ts b/src/app/routes/routes-routing.module.ts index 1ec46449..f8daf42a 100644 --- a/src/app/routes/routes-routing.module.ts +++ b/src/app/routes/routes-routing.module.ts @@ -74,8 +74,8 @@ const routes: Routes = [ { path: 'download', loadChildren: () => import('./download/download.module').then(m => m.DownloadModule) - } - ] + }, + { path: 'datatable', loadChildren: () => import('./datatable/datatable.module').then((m) => m.DatatableModule) },] }, // passport { @@ -100,4 +100,4 @@ const routes: Routes = [ ], exports: [RouterModule] }) -export class RouteRoutingModule {} +export class RouteRoutingModule { } diff --git a/src/app/routes/usercenter/components/freight/list/showService/showservice.component.ts b/src/app/routes/usercenter/components/freight/list/showService/showservice.component.ts index 107bdbd2..ce6e942a 100644 --- a/src/app/routes/usercenter/components/freight/list/showService/showservice.component.ts +++ b/src/app/routes/usercenter/components/freight/list/showService/showservice.component.ts @@ -49,7 +49,8 @@ export class ShowServiceComponent implements OnInit { return this.service.request(this.service.$api_getStaffList, params).pipe( map((res: any) => { return res.map((i: any) => { - return { label: i.name, value: i.appUserId }; + let name = i.name ? `${i.name} / ` : ''; + return { label: `${name}${i.telephone}`, value: i.appUserId }; }); }), ); diff --git a/src/app/shared/shared-g2.module.ts b/src/app/shared/shared-g2.module.ts index 685f05bc..93863e08 100644 --- a/src/app/shared/shared-g2.module.ts +++ b/src/app/shared/shared-g2.module.ts @@ -2,5 +2,7 @@ import { G2BarModule } from '@delon/chart/bar'; import { G2MiniAreaModule } from '@delon/chart/mini-area'; import { G2PieModule } from '@delon/chart/pie'; import { G2TimelineModule } from '@delon/chart/timeline'; +import { G2CardModule } from '@delon/chart/card'; -export const SHARED_G2_MODULES = [G2BarModule, G2PieModule, G2TimelineModule, G2MiniAreaModule]; + +export const SHARED_G2_MODULES = [G2BarModule, G2PieModule, G2TimelineModule, G2MiniAreaModule, G2CardModule]; From fd0099fb640509f6a2775a05681c5f679f67ee1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=98=E6=99=93=E4=BA=91?= Date: Mon, 28 Mar 2022 11:04:43 +0800 Subject: [PATCH 88/99] =?UTF-8?q?=E7=BB=99=E5=8F=B8=E6=9C=BA=E5=8F=91?= =?UTF-8?q?=E9=80=81=E7=9F=AD=E4=BF=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../assigned-car/assigned-car.component.ts | 16 +++++++++++++++- .../choose-famifiar.component.ts | 17 ++++++++++++++++- .../services/supply-management.service.ts | 6 ++++-- 3 files changed, 35 insertions(+), 4 deletions(-) diff --git a/src/app/routes/supply-management/components/assigned-car/assigned-car.component.ts b/src/app/routes/supply-management/components/assigned-car/assigned-car.component.ts index 929c2973..1793c83e 100644 --- a/src/app/routes/supply-management/components/assigned-car/assigned-car.component.ts +++ b/src/app/routes/supply-management/components/assigned-car/assigned-car.component.ts @@ -119,7 +119,15 @@ export class SupplyManagementVehicleAssignedCarComponent implements OnInit { nzContent: '该司机还未注册，是否邀请他注册？点击"是"系统将发送邀请短信给司机', nzOkText: '确定', nzCancelText: '取消', - nzOnOk: () => console.log('OK') + nzOnOk: () => { + this.sendMsg(this.sf?.value?.nameOrPhone).subscribe((res => { + if (res.code === '1') { + this.service.msgSrv.success('发送成功'); + } else { + this.service.msgSrv.success('发送失败'); + } + })); + } }); return []; } @@ -256,5 +264,11 @@ export class SupplyManagementVehicleAssignedCarComponent implements OnInit { }); } + /** +* 发送邀请司机注册短信 +*/ + sendMsg(phoneNumber: string) { + return this.service.request(this.service.$api_send_msg_code, phoneNumber) + } } diff --git a/src/app/routes/supply-management/components/choose-famifiar/choose-famifiar.component.ts b/src/app/routes/supply-management/components/choose-famifiar/choose-famifiar.component.ts index 9b9d33c0..3b5ada90 100644 --- a/src/app/routes/supply-management/components/choose-famifiar/choose-famifiar.component.ts +++ b/src/app/routes/supply-management/components/choose-famifiar/choose-famifiar.component.ts @@ -246,7 +246,15 @@ export class PublishGoodsChooseFamifiarComponent implements OnInit { nzContent: '该司机还未注册，是否邀请他注册？点击"是"系统将发送邀请短信给司机', nzOkText: '确定', nzCancelText: '取消', - nzOnOk: () => console.log('OK') + nzOnOk: () => { + this.sendMsg(this.sf?.value?.nameOrPhone).subscribe((res => { + if (res.code === '1') { + this.service.msgSrv.success('发送成功'); + } else { + this.service.msgSrv.success('发送失败'); + } + })); + } }); return []; } @@ -327,4 +335,11 @@ export class PublishGoodsChooseFamifiarComponent implements OnInit { } }); } + + /** +* 发送邀请司机注册短信 +*/ + sendMsg(phoneNumber: string) { + return this.service.request(this.service.$api_send_msg_code, phoneNumber) + } } diff --git a/src/app/routes/supply-management/services/supply-management.service.ts b/src/app/routes/supply-management/services/supply-management.service.ts index 1d30559b..10cbc648 100644 --- a/src/app/routes/supply-management/services/supply-management.service.ts +++ b/src/app/routes/supply-management/services/supply-management.service.ts @@ -119,8 +119,8 @@ export class SupplyManagementService extends BaseService { public $api_getContractContent = '/api/sdc/contractTemplate/getContractContent'; // 获取运价 public $api_getFreight = '/api/mdc/cuc/freightConfig/getFreight'; - // 从业资格证 - $api_recognizeQualificationCertificate = '/api/mdc/pbc/hwc/ocr/recognizeQualificationCertificate'; + // 从业资格证 + $api_recognizeQualificationCertificate = '/api/mdc/pbc/hwc/ocr/recognizeQualificationCertificate'; /** * 获取车型、车长字典数据 * @returns @@ -177,6 +177,8 @@ export class SupplyManagementService extends BaseService { $api_asyncExportWholeList = '/api/sdc/goodsResourceOperate/asyncExportWholeList'; // 根据货主ID查询合同签署属性 public $api_getContractAtr = '/api/mdc/cuc/enterpriseInfo/cargoOwner/getContractAtr'; + // 发送邀请司机短信 + $api_send_msg_code = `/api/mdc/pbc/smsSend/sendInviteDriver`; getDictByKey(dictKey: string) { const params = { dictKey: dictKey }; From 74befaef51924bc5925f431306b87a8249ffc83c Mon Sep 17 00:00:00 2001 From: wangshiming Date: Mon, 28 Mar 2022 11:15:27 +0800 Subject: [PATCH 89/99] fix bug --- .../components/bulk/bulk.component.html | 2 +- .../components/bulk/bulk.component.ts | 8 +++ .../components/vehicle/vehicle.component.html | 4 +- .../components/vehicle/vehicle.component.ts | 8 +++ .../services/order-management.service.ts | 8 ++- .../components/bulk/bulk.component.html | 2 +- .../components/bulk/bulk.component.ts | 8 +++ .../components/vehicle/vehicle.component.html | 4 +- .../components/vehicle/vehicle.component.ts | 53 ++++++++++--------- .../services/waybill-management.service.ts | 7 ++- 10 files changed, 72 insertions(+), 32 deletions(-) diff --git a/src/app/routes/order-management/components/bulk/bulk.component.html b/src/app/routes/order-management/components/bulk/bulk.component.html index 3a746c56..bab3a570 100644 --- a/src/app/routes/order-management/components/bulk/bulk.component.html +++ b/src/app/routes/order-management/components/bulk/bulk.component.html @@ -35,7 +35,7 @@ - + - + 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 22bdb5c3..5b7f1fb1 100644 --- a/src/app/routes/order-management/components/vehicle/vehicle.component.ts +++ b/src/app/routes/order-management/components/vehicle/vehicle.component.ts @@ -862,4 +862,12 @@ export class OrderManagementVehicleComponent extends BasicTableComponent impleme } }); } + // 导出 + exprot() { + this.service.request(this.service.$api_get_asyncExportWholeList, this.reqParams).subscribe((res: any) => { + if (res) { + this.service.msgSrv.success('导出成功，请去下载中心下载！'); + } + }); + } } diff --git a/src/app/routes/order-management/services/order-management.service.ts b/src/app/routes/order-management/services/order-management.service.ts index 0292cef2..4955b61e 100644 --- a/src/app/routes/order-management/services/order-management.service.ts +++ b/src/app/routes/order-management/services/order-management.service.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-03 15:31:52 * @LastEditors : Shiming - * @LastEditTime : 2022-03-25 15:27:40 + * @LastEditTime : 2022-03-28 11:07:48 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\services\\order-management.service.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -176,6 +176,12 @@ export class OrderManagementService extends ShipperBaseService { $api_get_getAppDriverPosition = `/api/sdc/billShipper/getAppDriverPosition`; // 查看申述记录 $api_get_getOrderComplaintDetail = `/api/sdc/billOperate/getOrderComplaintDetail`; + + + // 异步导出运营后台大宗订单列表 + $api_get_asyncExportBulkList = `/api/sdc/billOperate/asyncExportBulkList`; + // 异步导出运营后台整车订单列表 + $api_get_asyncExportWholeList = `/api/sdc/billOperate/asyncExportWholeList`; /** * 根据企业ID，获取企业历史网络货运人 * @returns diff --git a/src/app/routes/waybill-management/components/bulk/bulk.component.html b/src/app/routes/waybill-management/components/bulk/bulk.component.html index 851fa149..ae67a978 100644 --- a/src/app/routes/waybill-management/components/bulk/bulk.component.html +++ b/src/app/routes/waybill-management/components/bulk/bulk.component.html @@ -31,7 +31,7 @@
- + + + +
+ + + + + + + + + + + diff --git a/src/app/routes/partner/rebate-management/components/rebate-setting/add-partnerlist/add-partnerlist.component.less b/src/app/routes/partner/rebate-management/components/rebate-setting/add-partnerlist/add-partnerlist.component.less new file mode 100644 index 00000000..e87948ce --- /dev/null +++ b/src/app/routes/partner/rebate-management/components/rebate-setting/add-partnerlist/add-partnerlist.component.less @@ -0,0 +1,20 @@ +:host::ng-deep{ + .search-box{ + .ant-card-body{ + padding-bottom: 18px; + } + } + + .content-box{ + .ant-card-body{ + padding-top: 14px; + } + } + .imgBox { + display: flex; + img { + width: 60px !important; + } + } + +} \ No newline at end of file diff --git a/src/app/routes/partner/rebate-management/components/rebate-setting/add-partnerlist/add-partnerlist.component.ts b/src/app/routes/partner/rebate-management/components/rebate-setting/add-partnerlist/add-partnerlist.component.ts new file mode 100644 index 00000000..6e7c094b --- /dev/null +++ b/src/app/routes/partner/rebate-management/components/rebate-setting/add-partnerlist/add-partnerlist.component.ts @@ -0,0 +1,220 @@ +import { Component, OnInit, ViewChild, Type } from '@angular/core'; +import { STComponent, STColumn, STChange } from '@delon/abc/st'; +import { SFComponent, SFDateWidgetSchema, SFRadioWidgetSchema, SFSchema, SFSchemaEnum, SFSelectWidgetSchema, SFUISchema } from '@delon/form'; +import { ShipperBaseService } from '@shared'; +import { NzModalService } from 'ng-zorro-antd/modal'; +import { of } from 'rxjs'; +import { map } from 'rxjs/operators'; +import { RebateManagementService } from '../../../services/rebate-management.service'; + +@Component({ + selector: 'app-add-partnerlist', + templateUrl: './add-partnerlist.component.html', + styleUrls: ['./add-partnerlist.component.less'] +}) +export class ParterRebateManageMentAddPartnerListComponent implements OnInit { + @ViewChild('st', { static: true }) + st!: STComponent; + @ViewChild('sf', { static: false }) sf!: SFComponent; + ui: SFUISchema = {}; + i: any; + schema: SFSchema = {}; + addSchema: SFSchema = {}; + _$expand = false; + editText = ''; + formData: any; + isVisible = false; + edit = false; + editId = false; + selectedIndex = 0; + + + + columns: STColumn[] = [ + { title: '', type: 'checkbox', width: '50px', className: 'text-center' }, + { title: '异常编号', index: 'exceptionCode', width: '140px', className: 'text-left', }, + { title: '订单号', index: 'billCode', width: '160px', className: 'text-left', }, + { title: '装货地', index: 'loadingAddressArr', width: '220px', className: 'text-left', }, + { title: '卸货地', index: 'unloadingAddressArr', width: '220px', className: 'text-left', }, + { title: '承运司机', index: 'driver', width: '180px', className: 'text-left', }, + { title: '异常信息', index: 'exceptionContent', width: '100px', className: 'text-left', }, + { title: '异常图片', render: 'exceptionCertificateFirstFilePath', width: '150px', className: 'text-left', }, + { title: '上报时间', index: 'createTime', width: '140px', className: 'text-left', }, + { + title: '操作', index: 'createTime', width: '90px', className: 'text-left', + buttons: [ + { + text: '回复', + click: _record => this.reply(_record), + acl: { ability: ['AbnormalAppear-reply'] } + }, + ] + }, + ]; + columns2: STColumn[] = [ + { title: '异常编号', index: 'exceptionCode', width: '140px', className: 'text-left' }, + { title: '订单号', index: 'billCode', width: '160px', className: 'text-left' }, + { title: '装货地', index: 'loadingAddressArr', width: '220px', className: 'text-left' }, + { title: '卸货地', index: 'unloadingAddressArr', width: '220px', className: 'text-left' }, + { title: '承运司机', index: 'driver', width: '180px', className: 'text-left' }, + { title: '异常信息', index: 'exceptionContent', width: '100px', className: 'text-left' }, + { title: '异常图片', render: 'exceptionCertificateFirstFilePath', width: '150px', className: 'text-left' }, + { title: '上报时间', index: 'createTime', width: '140px', className: 'text-left' }, + { title: '回复内容', index: 'replyContent', width: '150px', className: 'text-left' }, + { title: '回复人', index: 'replyAppUserName', width: '90px', className: 'text-left' }, + { title: '回复时间', index: 'replyTime', width: '140px', className: 'text-left' }, + ]; + + get reqParams() { + let params: any = { ...this.sf?.value }; + if (params.reportingTime) { + const reportingTime = { start: this.sf?.value?.reportingTime?.[0], end: this.sf?.value?.reportingTime?.[1] } + params.reportingTime = reportingTime; + } + return params; + } + + get selectedRows() { + return this.st?.list.filter(item => item.checked) || []; + } + + constructor( + public service: RebateManagementService, + private nzModalService: NzModalService, + public shipperSrv: ShipperBaseService, + private modal: NzModalService, + + ) { } + + ngOnInit(): void { + this.initSF() + } + + /** + * 伸缩查询条件 + */ + expandToggle(): void { + this._$expand = !this._$expand; + this.sf?.setValue('/_$expand', this._$expand); + } + /** + * 查询字段个数 + */ + get queryFieldCount(): number { + return Object.keys(this.schema?.properties || {}).length; + } + initSF() { + this.schema = { + properties: { + _$expand: { type: 'boolean', ui: { hidden: true } }, + exceptionCode: { + type: 'string', + title: '异常编号', + ui: { placeholder: '请输入' } + }, + billCode: { + type: 'string', + title: '订单号', + ui: { + placeholder: '最多100个订单，空号隔开', + } + }, + exceptionType: { + title: '异常类型', + type: 'string', + ui: { + widget: 'dict-select', + containsAllLabel: true, + params: { dictKey: 'exception:report:type' }, + } as SFSelectWidgetSchema + }, + driverName: { + title: '承运司机', + type: 'string', + ui: { + visibleIf: { + _$expand: (value: boolean) => value + } + } + }, + carNo: { + title: '车牌号', + type: 'string', + ui: { + visibleIf: { + _$expand: (value: boolean) => value + } + } + }, + reportingTime: { + title: '上报时间', + type: 'string', + ui: { + widget: 'date', + mode: 'range', + format: 'yyyy-MM-dd', + visibleIf: { + _$expand: (value: boolean) => value + } + } as SFDateWidgetSchema + } + } + }; + this.ui = { '*': { spanLabelFixed: 110, grid: { span: 8, gutter: 4 } } }; + } + + search() { + if (this.selectedIndex === 0) { + this.st?.load(1) + } + } + + selectedIndexChange(event: any) { + if (this.selectedIndex === 0) { + this.st?.load(1) + } + } + /** + * 重置表单 + */ + resetSF() { + this.sf.reset(); + } + // 回复操作 + reply(item: any) { + // const modalRef = this.modal.create({ + // nzTitle: '回复', + // nzWidth: 700, + // nzContent: AbnormalReplyComponent, + // nzComponentParams: { + // i: item + // }, + // nzFooter: null + // }); + // modalRef.afterClose.subscribe((res) => { + // if (res) { + // this.resetSF; + // this.st.load(); + // } + // }); + } + // 批量回复操作 + batchReply() { + // if (this.selectedRows.length === 0) { + // this.service.msgSrv.warning('请勾选数据！') + // return; + // } + // const modalRef = this.modal.create({ + // nzTitle: '批量回复', + // nzContent: AbnormalreplyBatchComponent, + // nzComponentParams: { + // selectedRows: this.selectedRows + // }, + // nzFooter: null + // }); + // modalRef.afterClose.subscribe(() => { + // this.resetSF; + // this.st.load(); + // }); + } +} diff --git a/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.html b/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.html index 9dc5b6f9..1256170c 100644 --- a/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.html +++ b/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-02-24 20:09:49 * @LastEditors : Shiming - * @LastEditTime : 2022-03-21 13:53:31 + * @LastEditTime : 2022-03-28 15:39:27 * @FilePath : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\components\\rebate-setting\\add\\add.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -33,7 +33,7 @@ -   添加 +   添加    @@ -49,6 +49,17 @@ - +
+ + +
+ +
+ + +
+ diff --git a/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.ts b/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.ts index 3edd7ef2..3821b57f 100644 --- a/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.ts +++ b/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.ts @@ -1,10 +1,10 @@ /* - * @Description : + * @Description : * @Version : 1.0 * @Author : Shiming * @Date : 2022-03-21 09:26:45 * @LastEditors : Shiming - * @LastEditTime : 2022-03-21 13:44:34 + * @LastEditTime : 2022-03-28 14:45:41 * @FilePath : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\components\\rebate-setting\\add\\add.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -16,6 +16,7 @@ import { SFComponent, SFDateWidgetSchema, SFSchema, SFUISchema } from '@delon/fo import { processSingleSort, ShipperBaseService } from '@shared'; import { NzModalService } from 'ng-zorro-antd/modal'; import { RebateManagementService } from '../../../services/rebate-management.service'; +import { ParterRebateManageMentAddPartnerListComponent } from '../add-partnerlist/add-partnerlist.component'; @Component({ selector: 'app-parter-channel-rebate-management-add', styleUrls: ['./add.component.less'], @@ -26,7 +27,7 @@ export class ParterRebateManageMentAddComponent implements OnInit { toFixedValue: Number = 2; radioValue = 'A'; precision = 2; - inputValue= ''; + inputValue = ''; @ViewChild('sf', { static: false }) sf!: SFComponent; schema1!: SFSchema; constructor( @@ -34,7 +35,7 @@ export class ParterRebateManageMentAddComponent implements OnInit { public ar: ActivatedRoute, public service: RebateManagementService, private modal: NzModalService, - public shipperservice: ShipperBaseService, + public shipperservice: ShipperBaseService ) {} initSF(data?: any) { this.schema1 = { @@ -55,6 +56,28 @@ export class ParterRebateManageMentAddComponent implements OnInit { }; } ngOnInit() { - this.initSF() + this.initSF(); + } + submit() {} + goBack() { + window.history.go(-1); + } + /** + *申请退款 + */ + add(item?: any) { + const modalRef = this.modal.create({ + nzTitle: '申请退款', + nzContent: ParterRebateManageMentAddPartnerListComponent, + nzComponentParams: { + i: item, + }, + nzFooter: null + }); + modalRef.afterClose.subscribe((res: boolean) => { + if (res) { + + } + }); } } From cb50d0c36b57574aa345a1d5d8ae355d001b2dd3 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Mon, 28 Mar 2022 16:03:35 +0800 Subject: [PATCH 96/99] fix bug --- .../components/vehicle/vehicle.component.ts | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) 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 0bcc6731..37d2336c 100644 --- a/src/app/routes/order-management/components/vehicle/vehicle.component.ts +++ b/src/app/routes/order-management/components/vehicle/vehicle.component.ts @@ -98,7 +98,7 @@ export class OrderManagementVehicleComponent extends BasicTableComponent impleme if (this.resourceStatus) { a.billStatus = this.resourceStatus; } - const params: any = Object.assign({}, this.sf?.value || {}); + const params: any = Object.assign({}, this.sf?.value || this.paramsList); delete params._$expand; return { ...a, @@ -109,14 +109,8 @@ export class OrderManagementVehicleComponent extends BasicTableComponent impleme const a: any = {}; if (this.resourceStatus) { a.billStatus = this.resourceStatus; - // Object.assign(requestOptions.body, { - // ...a - // }); } - const params: any = Object.assign({}, this.sf?.value || this.paramsList); - console.log(this.sf?.value); - console.log(this.paramsList); delete params._$expand; this.paramsList = params Object.assign(requestOptions.body, { From 30143b24bf72a9a84a8a4e224ccb8a43df4f3db1 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Mon, 28 Mar 2022 17:36:09 +0800 Subject: [PATCH 97/99] e --- proxy.conf.js | 2 +- .../express-detail-modal/express-detail-modal.component.ts | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/proxy.conf.js b/proxy.conf.js index 10071e14..67c15ee2 100644 --- a/proxy.conf.js +++ b/proxy.conf.js @@ -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/ticket-management/components/express-info/express-detail-modal/express-detail-modal.component.ts b/src/app/routes/ticket-management/components/express-info/express-detail-modal/express-detail-modal.component.ts index 13ba19ed..22e0f733 100644 --- a/src/app/routes/ticket-management/components/express-info/express-detail-modal/express-detail-modal.component.ts +++ b/src/app/routes/ticket-management/components/express-info/express-detail-modal/express-detail-modal.component.ts @@ -34,11 +34,11 @@ export class ExpressDetailModalComponent implements OnInit { }, { title: '金额', - index: 'vatnotax', + index: 'vatmoney', width: 90, type: 'widget', className: 'text-right', - widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.vatnotax }) } + widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.vatmoney }) } }, { title: '税率', @@ -53,7 +53,7 @@ export class ExpressDetailModalComponent implements OnInit { width: 90, type: 'widget', className: 'text-right', - widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.vatnotax }) } + widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.vattax }) } }, { title: '开票日期', index: 'invoicedate', type: 'date', width: 150, className: 'text-center' } ]; From 6bb5f3808e3d38a4d07e6f2f30d8a2b48601ab83 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Mon, 28 Mar 2022 17:47:04 +0800 Subject: [PATCH 98/99] e --- .../driver-account-detail.component.ts | 9 +++++++-- .../driver-account/driver-account.component.ts | 5 +++-- .../recharge-record/recharge-record.component.ts | 3 ++- .../transaction-flow/transaction-flow.component.ts | 3 ++- .../withdrawals-detail/withdrawals-detail.component.ts | 3 ++- .../withdrawals-record/withdrawals-record.component.ts | 3 ++- .../withdrawals-detail/withdrawals-detail.component.ts | 6 +++--- .../withdrawals-record/withdrawals-record.component.ts | 3 ++- 8 files changed, 23 insertions(+), 12 deletions(-) diff --git a/src/app/routes/financial-management/components/driver-account/driver-account-detail/driver-account-detail.component.ts b/src/app/routes/financial-management/components/driver-account/driver-account-detail/driver-account-detail.component.ts index 0a384b6c..679bd575 100644 --- a/src/app/routes/financial-management/components/driver-account/driver-account-detail/driver-account-detail.component.ts +++ b/src/app/routes/financial-management/components/driver-account/driver-account-detail/driver-account-detail.component.ts @@ -165,7 +165,9 @@ export class DriverAccountDetailComponent implements OnInit { { title: '交易时间', index: 'createTime', type: 'date' }, { title: '流水号', index: 'channelPaySn' }, { title: '交易类型', index: 'tradeTypeLabel', className: 'text-center' }, - { title: '关联单号', index: 'businessNumber' }, + { title: '交易单号', index: 'businessNumber' }, + { title: '订单号', index: 'orderSn' }, + { title: '运单号', index: 'transportSn' }, { title: '收支类型', index: 'incomeTypeLabel', className: 'text-center' }, { title: '交易金额', @@ -182,7 +184,10 @@ export class DriverAccountDetailComponent implements OnInit { type: 'widget', className: 'text-right', widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.accountBalance }) } - } + }, + { title: '付款方', index: 'payName'}, + { title: '收款方', index: 'payeeName' }, + { title: '备注', index: 'tradeContent' }, ]; } } diff --git a/src/app/routes/financial-management/components/driver-account/driver-account.component.ts b/src/app/routes/financial-management/components/driver-account/driver-account.component.ts index 6ab9883f..7861fd50 100644 --- a/src/app/routes/financial-management/components/driver-account/driver-account.component.ts +++ b/src/app/routes/financial-management/components/driver-account/driver-account.component.ts @@ -164,7 +164,7 @@ export class DriverAccountComponent implements OnInit { { title: '司机姓名', width: 140, index: 'name' }, { title: '证件号码', width: 140, index: 'idNo' }, { title: '手机号', width: 140, index: 'phone' }, - { title: '网络货运人', width: 140, index: 'ltdName' }, + { title: '网络货运人', width: 180, index: 'ltdName' }, { title: '银行类型', width: 120, index: 'bankTypeLabel' }, { title: '虚拟账户', width: 140, index: 'virtualAccount' }, { @@ -186,13 +186,14 @@ export class DriverAccountComponent implements OnInit { { title: '本月累计提现金额', index: 'withdrawBalance', - width: 150, + width: 160, type: 'widget', className: 'text-right', widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.withdrawBalance }) } }, { title: '账户总余额', render: 'availableBalance', className: 'text-right', width: 180 }, { title: '创建时间', index: 'createTime', type: 'date', width: 150 }, + { title: '状态', index: 'stateDeletedLabel', width: 120 }, { title: '操作', width: 120, diff --git a/src/app/routes/financial-management/components/recharge-record/recharge-record.component.ts b/src/app/routes/financial-management/components/recharge-record/recharge-record.component.ts index c73b8833..85e4899b 100644 --- a/src/app/routes/financial-management/components/recharge-record/recharge-record.component.ts +++ b/src/app/routes/financial-management/components/recharge-record/recharge-record.component.ts @@ -190,7 +190,8 @@ export class RechargeRecordComponent implements OnInit { rmYll: item.roleId, snglFlgCd: item.paySerialNumber2, bussType: '06', - ltdId: item.ltdId + ltdId: item.ltdId, + accountType: item.accountType }) } ] diff --git a/src/app/routes/financial-management/components/transaction-flow/transaction-flow.component.ts b/src/app/routes/financial-management/components/transaction-flow/transaction-flow.component.ts index 92cb10f7..98465648 100644 --- a/src/app/routes/financial-management/components/transaction-flow/transaction-flow.component.ts +++ b/src/app/routes/financial-management/components/transaction-flow/transaction-flow.component.ts @@ -253,7 +253,8 @@ export class TransactionFlowComponent { rmYll: item.roleId, snglFlgCd: item.channelPaySn, bussType: item.tradeType === '7' ? '05' : item.tradeType === '8' ? '06' : '07', - ltdId: item.ltdId + ltdId: item.ltdId, + accountType: item.accountType }) } ] diff --git a/src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.ts b/src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.ts index 77f2cfd9..85144954 100644 --- a/src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.ts +++ b/src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.ts @@ -99,7 +99,8 @@ export class WithdrawalsDetailComponent implements OnInit { rmYll: this.formData.userId, snglFlgCd: this.formData.coreSerNo, bussType: '06', - ltdId: this.formData.ltdId + ltdId: this.formData.ltdId, + accountType: this.formData.accountType }); } diff --git a/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.ts b/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.ts index 42734ac9..907c9ad5 100644 --- a/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.ts +++ b/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.ts @@ -297,7 +297,8 @@ export class WithdrawalsRecordComponent { rmYll: item.userId, snglFlgCd: item.coreSerNo, bussType: '06', - ltdId: item.ltdId + ltdId: item.ltdId, + accountType: item.accountType }) } ] diff --git a/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.ts b/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.ts index 95657e1e..baf83686 100644 --- a/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.ts +++ b/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.ts @@ -2,7 +2,6 @@ import { Component, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { FreightAccountService } from 'src/app/routes/financial-management/services/freight-account.service'; - @Component({ selector: 'app-partner-account-management-withdrawals-detail', templateUrl: './withdrawals-detail.component.html', @@ -18,7 +17,7 @@ export class PartnerAccountManagementWithdralDetailComponent implements OnInit { this.loadRefundDetail(id); } - ngOnInit(): void { } + ngOnInit(): void {} loadRefundDetail(id: string) { this.service.request(this.service.$api_get_refund_detail, { id }).subscribe(res => { @@ -77,7 +76,8 @@ export class PartnerAccountManagementWithdralDetailComponent implements OnInit { rmYll: this.formData.userId, snglFlgCd: this.formData.coreSerNo, bussType: '06', - ltdId: this.formData.ltdId + ltdId: this.formData.ltdId, + accountType: this.formData.accountType }); } diff --git a/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.ts b/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.ts index 4bb0a0d9..ad7c8ead 100644 --- a/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.ts +++ b/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.ts @@ -311,7 +311,8 @@ export class PartnerAccountManagementWithdrawalsRecordComponent implements OnIni rmYll: item.userId, snglFlgCd: item.coreSerNo, bussType: '06', - ltdId: item.ltdId + ltdId: item.ltdId, + accountType: item.accountType }) }, { From afd993db5125becc247ed7593d1cf8b58bd6ed60 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Mon, 28 Mar 2022 17:55:49 +0800 Subject: [PATCH 99/99] e --- .../cancellation-invoice.component.ts | 9 +++++++++ .../routes/ticket-management/services/ticket.service.ts | 6 ++++-- 2 files changed, 13 insertions(+), 2 deletions(-) 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 be6850ef..5911e06b 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 @@ -205,6 +205,10 @@ export class CancellationInvoiceComponent implements OnInit { }); } + downLoadDetail(item: any) { + this.service.exportStart({ id: item.id }, this.service.$api_export_invoic_detail); + } + /** * 推送发票 * @param item @@ -387,6 +391,11 @@ export class CancellationInvoiceComponent implements OnInit { queryParams: { type: 1, expressno: item.expressno, ltdId: item.shipperId } }) }, + { + text: '销货清单
', + iif: item => item.isdetail, + click: item => this.downLoadDetail(item) + }, { text: '手工开票
', iif: item => item.sts != '3', diff --git a/src/app/routes/ticket-management/services/ticket.service.ts b/src/app/routes/ticket-management/services/ticket.service.ts index a3629120..932f19c9 100644 --- a/src/app/routes/ticket-management/services/ticket.service.ts +++ b/src/app/routes/ticket-management/services/ticket.service.ts @@ -46,6 +46,8 @@ export class TicketService extends ShipperBaseService { $api_batch_push_invoic = '/api/fcc/ficoVatinvH/crmPushInvoBath'; // 发票作废 $api_cancel_invoic = '/api/fcc/ficoVatinvH/inpinvHCancel'; + // 运营端销票处理导出销售清单 + $api_export_invoic_detail = '/api/fcc/ficoVatinvH/reportVatinvHByOperator'; // 获取汇总下单路径 $api_get_order_summary_path = '/api/fcc/ficoExpressH/getSummaryOrderAddress'; @@ -60,7 +62,7 @@ export class TicketService extends ShipperBaseService { $api_get_invoice_page = '/api/fcc/ficoVatinvH/list/page'; // 更新快递信息 - $api_update_Express= '/api/fcc/ficoVatinvH/updateExpress'; + $api_update_Express = '/api/fcc/ficoVatinvH/updateExpress'; // 发票作废 $api_cancel_invoice = '/api/fcc/ficoVatinvH/inpinvHCancel'; @@ -121,7 +123,7 @@ export class TicketService extends ShipperBaseService { // 根据地区code查询列表 $api_get_region_by_code = '/api/mdc/pbc/region/getRegionByCode'; - + constructor(public injector: Injector) { super(injector); }