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 01/41] - --- .../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 f38a165c67a6002dc2eb5e2deb8bd5a2bccd002c Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Thu, 24 Mar 2022 09:04:07 +0800 Subject: [PATCH 02/41] 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 03/41] 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 04/41] 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 05/41] 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 06/41] 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 07/41] 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 08/41] 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 09/41] - --- 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 10/41] 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 11/41] 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 12/41] 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 13/41] 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 14/41] 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 15/41] 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 18/41] 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 23/41] 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 24/41] 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 25/41] 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 26/41] =?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 27/41] 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 28/41] 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 29/41] 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 30/41] 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 32/41] 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 39/41] 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 40/41] 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}}