From 9e129f9a3f11ce75bc7762a4647646d2bb9ba793 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Wed, 5 Jan 2022 14:11:29 +0800 Subject: [PATCH 1/7] edit --- .../basic-setting.component.html | 140 ++++++----------- .../basic-setting.component.less | 9 +- .../basic-setting/basic-setting.component.ts | 142 +++++++----------- .../sys-setting/services/system.service.ts | 4 + 4 files changed, 114 insertions(+), 181 deletions(-) diff --git a/src/app/routes/sys-setting/components/basic-setting/basic-setting.component.html b/src/app/routes/sys-setting/components/basic-setting/basic-setting.component.html index e1e56e16..3fe41c1e 100644 --- a/src/app/routes/sys-setting/components/basic-setting/basic-setting.component.html +++ b/src/app/routes/sys-setting/components/basic-setting/basic-setting.component.html @@ -2,7 +2,7 @@
    -
  • {{ item.name }}
    • @@ -10,107 +10,67 @@
- -

货主提现设置

+ +

{{selectedTab?.name}}

- - - - - - - - - - - + + + + + + + + + + + + + + + + + + + -- + + + + + + + + + + + + + + + + + + +
- -

路桥发票设置

-
-
- - - - - - - -

开启自动申请后，运单完成卸货后会自动根据运单信息申请ETC发票。

- -
-
- - - -

风险单监控

-
-
- - - - - - - - - - -

当前时间与计划时间对比，允许如上合理范围内执行不报异常，差异在范围外则报异常

- - - - - - - - - - - -

当前时间与计划时间对比，允许如上合理范围内执行不报异常，差异在范围外则报异常

- - - - - - - - - - - -

签收量与装运量对比，允许如上合理范围内损耗不报异常，差异在范围外则报异常

- - - - - - - - - - - -

装货地和发货地、签收地和收货地距离对比，允许如上合理范围内执行不报异常，差异在范围外则报异常

- -
-
-
- +
diff --git a/src/app/routes/sys-setting/components/basic-setting/basic-setting.component.less b/src/app/routes/sys-setting/components/basic-setting/basic-setting.component.less index c5cbb76e..8e398b39 100644 --- a/src/app/routes/sys-setting/components/basic-setting/basic-setting.component.less +++ b/src/app/routes/sys-setting/components/basic-setting/basic-setting.component.less @@ -10,13 +10,18 @@ } .block-radio { - display : flex; - min-height : 32px; + display : flex; + min-height: 32px; } input { width : 100px; margin-left: 10px; } + + .ant-form-item-control-input-content { + display: flex; + } } + } \ No newline at end of file diff --git a/src/app/routes/sys-setting/components/basic-setting/basic-setting.component.ts b/src/app/routes/sys-setting/components/basic-setting/basic-setting.component.ts index fcaf3dd5..3115e98d 100644 --- a/src/app/routes/sys-setting/components/basic-setting/basic-setting.component.ts +++ b/src/app/routes/sys-setting/components/basic-setting/basic-setting.component.ts @@ -1,5 +1,6 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { SFComponent, SFSchema, SFUISchema } from '@delon/form'; +import { dateTimePickerUtil } from '@delon/util'; import { SystemService } from '../../services/system.service'; @Component({ @@ -8,102 +9,65 @@ import { SystemService } from '../../services/system.service'; styleUrls: ['./basic-setting.component.less'] }) export class BasicSettingComponent implements OnInit { - formDate: any = { - isAudit: false, - isEveryDay: false, - isEveryWeek: false - }; - tabs = [ - { - name: '货主提现设置' - }, - { - name: '司机提现设置' - }, - { - name: '路桥发票设置' - }, - { - name: '风险单监控' - } - ]; - selectedTab = 0; + tabs: any[] = []; + selectedTab: any = null; - checkOptionsOne = [ - { label: '周一', value: '周一', checked: true }, - { label: '周二', value: '周二' }, - { label: '周三', value: '周三' }, - { label: '周四', value: '周四' }, - { label: '周五', value: '周五' }, - { label: '周六', value: '周六' }, - { label: '周日', value: '周日' } - ]; - - configList: any = [ - { - configId: '1475393700370898945', - itemKey: 'goods.name.config.type.3.3', - itemType: 1, - itemValue: '{"data":false,"type":"radio","trueLable":"开启","falseLable":"关闭"}', - name: '货主是否可以设置车队长', - parentId: '0', - remark: '' - }, - { - configId: '1475393700370898945', - itemKey: 'goods.name.config.type.3.4', - itemType: 1, - itemValue: '{"data":false,"type":"radio","trueLable":"开启","falseLable":"关闭"}', - name: '货主企业四要素校验开关', - parentId: '0', - remark: '' - }, - { - configId: '1475393700370898945', - itemKey: 'goods.name.config.type.3.5', - itemType: 1, - itemValue: '{"data":false,"type":"radio","trueLable":"开启","falseLable":"关闭"}', - name: '货主提现功能开关', - parentId: '0', - remark: '' - }, - { - configId: '1475393700370898945', - itemKey: 'goods.name.config.type.3.5', - itemType: 1, - itemValue: '{"data":"","type":"input","afterLable":"%"}', - name: '货主费率配置', - parentId: '0', - remark: '' - }, - { - configId: '1475393700370898945', - itemKey: 'goods.name.config.type.3.5', - itemType: 1, - itemValue: '{"data":"5","type":"input","afterLable":"次"}', - name: '单个用户每天最大发送短信次数', - parentId: '0', - remark: '' - }, - { - configId: '1475393700370898945', - itemKey: 'goods.name.config.type.3.5', - itemType: 1, - itemValue: '{"data":true,"type":"radio","trueLable":"开启","falseLable":"关闭","isCustom":true}', - name: '合同单权限', - parentId: '0', - remark: '' - } - ]; + configList: any = []; constructor(private service: SystemService) {} ngOnInit() { - this.configList = this.configList.map((item: any) => ({ ...item, itemValue: JSON.parse(item.itemValue) })); + this.getTypeList(); } - changeType(type: number): void { + getTypeList() { + this.service.request(this.service.$api_get_config_tree, { configFullKey: 'sys.config' }).subscribe((res: Array) => { + if (res?.length > 0) { + const typeData = res.find(config => config.configFullKey === 'sys.config'); + if (typeData) { + this.tabs = typeData.children; + this.selectedTab = typeData.children[0]; + this.getConfigList(this.selectedTab.id); + } + } + }); + } + + getConfigList(id: string) { + this.service.request(this.service.$api_get_config_by_parent_id, { id }).subscribe((res: Array) => { + if (res?.length > 0) { + res = res.map(item => ({ + ...item, + remark: item.remark ? JSON.parse(item.remark) : null, + itemValue: item.itemValue ? JSON.parse(item.itemValue) : item.itemValue + })); + this.configList = res; + console.log(res); + } else { + this.configList = []; + } + }); + } + + changeType(type: any): void { this.selectedTab = type; - console.log(type); + this.getConfigList(this.selectedTab.id); + } + + saveAction() { + if (this.configList?.length < 0) { + return; + } + const params = this.configList.map((item: any) => ({ + ...item, + remark: item.remark ? JSON.stringify(item.remark) : null, + itemValue: item.itemValue ? JSON.stringify(item.itemValue) : null + })); + this.service.request(this.service.$api_update_config_batch, params).subscribe(res => { + if (res) { + this.service.msgSrv.success('修改配置成功'); + this.getConfigList(this.selectedTab.id); + } + }); } } diff --git a/src/app/routes/sys-setting/services/system.service.ts b/src/app/routes/sys-setting/services/system.service.ts index 32d1f4fa..993a3c30 100644 --- a/src/app/routes/sys-setting/services/system.service.ts +++ b/src/app/routes/sys-setting/services/system.service.ts @@ -101,6 +101,8 @@ export class SystemService extends BaseService { // 根据FullKey获取系统子配置(树) public $api_get_config_tree = '/api/mdc/pbc/sysConfig/getSysConfigTreeByParentFullKey'; + // 查找系统配置项列表 + public $api_get_config_by_parent_id = '/api/mdc/pbc/sysConfigItem/findSysConfigItemBySysConfigId'; // 新增系统配置 public $api_add_config = '/api/mdc/pbc/sysConfig/save'; // 更新系统配置 @@ -115,6 +117,8 @@ export class SystemService extends BaseService { public $api_add_config_item = '/api/mdc/pbc/sysConfigItem/save'; // 更新系统配置项 public $api_update_config_item = '/api/mdc/pbc/sysConfigItem/update'; + // 批量更新系统配置项 + public $api_update_config_batch = '/api/mdc/pbc/sysConfigItem/updateBatch'; // 更新系统配置项排序 public $api_update_config_item_sort = '/api/mdc/pbc/sysConfigItem/updateSort'; // 删除系统配置项 From badaa27cff7befe636bc5d275ad810add260715d Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Wed, 5 Jan 2022 14:52:22 +0800 Subject: [PATCH 2/7] edit --- src/app/routes/account/account-routing.module.ts | 9 ++++----- .../passport/components/login/login.component.ts | 16 ++++++++++------ 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/src/app/routes/account/account-routing.module.ts b/src/app/routes/account/account-routing.module.ts index f3e14b15..3e5662da 100644 --- a/src/app/routes/account/account-routing.module.ts +++ b/src/app/routes/account/account-routing.module.ts @@ -16,14 +16,13 @@ const routes: Routes = [ path: 'center', component: AccountComponentsCenterComponent, data: { - title: '账户中心', - titleI18n: 'app.my.center', - }, - }, + title: '账户中心' + } + } ]; @NgModule({ imports: [RouterModule.forChild(routes)], - exports: [RouterModule], + exports: [RouterModule] }) export class AccountRoutingModule {} diff --git a/src/app/routes/passport/components/login/login.component.ts b/src/app/routes/passport/components/login/login.component.ts index 82ebba95..d9874028 100644 --- a/src/app/routes/passport/components/login/login.component.ts +++ b/src/app/routes/passport/components/login/login.component.ts @@ -164,15 +164,19 @@ export class UserLoginComponent implements OnInit, OnDestroy { // this.captchaSrv.sendSMSCaptchaByMobile(); if (result) { this.captchaSrv.sendSMSCaptchaByMobile(this.captchaSF.value.phone).subscribe(res => { + console.log(res); + if (res.success && res.data.code === '1') { this.captchaSrv.msgSrv.success('发送验证码成功'); this.createInterval(); - } else if (res.data.code === '503046') { - this.dunHelper.popUp(this.captchaSF.value.phone).subscribe(_ => { - this.createInterval(); - this.dunHelper.destory(); - }); - } else { + } + // else if (res.status === 503609) { + // this.dunHelper.popUp(this.captchaSF.value.phone).subscribe(_ => { + // this.createInterval(); + // this.dunHelper.destory(); + // }); + // } + else { this.captchaSrv.msgSrv.warning(res.msg); } }); From 3be663b9af15ca9677759fc22beeea9beb077993 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Wed, 5 Jan 2022 17:14:08 +0800 Subject: [PATCH 3/7] edit --- .../less/box.less} | 15 +- src/app/routes/commom/less/expend-but.less | 13 + .../basic-setting.component.html | 52 +-- .../basic-setting/basic-setting.component.ts | 1 + .../add-cart/add-cart.component.html | 15 + .../add-cart/add-cart.component.less | 0 .../add-cart/add-cart.component.ts | 71 ++++ .../add-owner/add-owner.component.html | 16 + .../add-owner/add-owner.component.less | 0 .../add-owner/add-owner.component.ts | 80 +++++ .../etc-blacklist.component.html | 14 +- .../etc-blacklist.component.less | 11 - .../etc-blacklist/etc-blacklist.component.ts | 293 +++++++++------- .../etc-invoiced-list.component.html | 21 +- .../etc-invoiced-list.component.less | 13 - .../etc-invoiced-list.component.ts | 210 ++++++----- .../transaction-details.component.html | 4 +- .../transaction-details.component.ts | 27 +- .../etc-invoiced-logs.component.html | 12 +- .../etc-invoiced-logs.component.ts | 263 +++++++------- .../etc-invoiced-requested.component.html | 29 +- .../etc-invoiced-requested.component.ts | 330 +++++++++--------- .../ticket-management.module.ts | 15 +- src/assets/mocks/menu-data.json | 4 +- 24 files changed, 891 insertions(+), 618 deletions(-) rename src/app/routes/{ticket-management/components/etc-invoiced-requested/etc-invoiced-requested.component.less => commom/less/box.less} (60%) create mode 100644 src/app/routes/commom/less/expend-but.less create mode 100644 src/app/routes/ticket-management/components/etc-blacklist/add-cart/add-cart.component.html create mode 100644 src/app/routes/ticket-management/components/etc-blacklist/add-cart/add-cart.component.less create mode 100644 src/app/routes/ticket-management/components/etc-blacklist/add-cart/add-cart.component.ts create mode 100644 src/app/routes/ticket-management/components/etc-blacklist/add-owner/add-owner.component.html create mode 100644 src/app/routes/ticket-management/components/etc-blacklist/add-owner/add-owner.component.less create mode 100644 src/app/routes/ticket-management/components/etc-blacklist/add-owner/add-owner.component.ts delete mode 100644 src/app/routes/ticket-management/components/etc-invoiced-list/etc-invoiced-list.component.less diff --git a/src/app/routes/ticket-management/components/etc-invoiced-requested/etc-invoiced-requested.component.less b/src/app/routes/commom/less/box.less similarity index 60% rename from src/app/routes/ticket-management/components/etc-invoiced-requested/etc-invoiced-requested.component.less rename to src/app/routes/commom/less/box.less index fa54474b..40095399 100644 --- a/src/app/routes/ticket-management/components/etc-invoiced-requested/etc-invoiced-requested.component.less +++ b/src/app/routes/commom/less/box.less @@ -19,19 +19,8 @@ padding-left : 16px; padding-right: 16px; } -} -.expend-options { - margin-top: 0px; -} - - -@media (min-width: 1200px) { - .expend-options { - margin-top: -40px; - max-width : 400px; - position : absolute; - right : 0; - bottom : 30px; + .text-truncate { + white-space: normal; } } \ No newline at end of file diff --git a/src/app/routes/commom/less/expend-but.less b/src/app/routes/commom/less/expend-but.less new file mode 100644 index 00000000..d3b5b6b0 --- /dev/null +++ b/src/app/routes/commom/less/expend-but.less @@ -0,0 +1,13 @@ +.expend-options { + margin-top: 0px; +} + + +@media (min-width: 1200px) { + .expend-options { + max-width: 400px; + position : absolute; + right : 0; + bottom : 25px; + } +} \ No newline at end of file diff --git a/src/app/routes/sys-setting/components/basic-setting/basic-setting.component.html b/src/app/routes/sys-setting/components/basic-setting/basic-setting.component.html index 3fe41c1e..c1e39229 100644 --- a/src/app/routes/sys-setting/components/basic-setting/basic-setting.component.html +++ b/src/app/routes/sys-setting/components/basic-setting/basic-setting.component.html @@ -34,34 +34,38 @@ - - - -- - - +
+ + + + + +
- - - + + + + + + + + + + + + + + + - - - - - - - - - - diff --git a/src/app/routes/sys-setting/components/basic-setting/basic-setting.component.ts b/src/app/routes/sys-setting/components/basic-setting/basic-setting.component.ts index 3115e98d..f40d2acc 100644 --- a/src/app/routes/sys-setting/components/basic-setting/basic-setting.component.ts +++ b/src/app/routes/sys-setting/components/basic-setting/basic-setting.component.ts @@ -39,6 +39,7 @@ export class BasicSettingComponent implements OnInit { res = res.map(item => ({ ...item, remark: item.remark ? JSON.parse(item.remark) : null, + extend: item.extend ? JSON.parse(item.extend) : [], itemValue: item.itemValue ? JSON.parse(item.itemValue) : item.itemValue })); this.configList = res; diff --git a/src/app/routes/ticket-management/components/etc-blacklist/add-cart/add-cart.component.html b/src/app/routes/ticket-management/components/etc-blacklist/add-cart/add-cart.component.html new file mode 100644 index 00000000..a95dc023 --- /dev/null +++ b/src/app/routes/ticket-management/components/etc-blacklist/add-cart/add-cart.component.html @@ -0,0 +1,15 @@ +
+
+ +
+
+ + +
+ + +
\ No newline at end of file diff --git a/src/app/routes/ticket-management/components/etc-blacklist/add-cart/add-cart.component.less b/src/app/routes/ticket-management/components/etc-blacklist/add-cart/add-cart.component.less new file mode 100644 index 00000000..e69de29b diff --git a/src/app/routes/ticket-management/components/etc-blacklist/add-cart/add-cart.component.ts b/src/app/routes/ticket-management/components/etc-blacklist/add-cart/add-cart.component.ts new file mode 100644 index 00000000..2bb9cd6c --- /dev/null +++ b/src/app/routes/ticket-management/components/etc-blacklist/add-cart/add-cart.component.ts @@ -0,0 +1,71 @@ +import { Component, OnInit, ViewChild } from '@angular/core'; +import { Router } from '@angular/router'; +import { STComponent, STColumn, STRequestOptions, STChange } from '@delon/abc/st'; +import { SFComponent, SFSchema, SFDateWidgetSchema } from '@delon/form'; +import { NzModalService } from 'ng-zorro-antd/modal'; +import { TicketService } from '../../../services/ticket.service'; + +@Component({ + selector: 'app-add-cart', + templateUrl: './add-cart.component.html', + styleUrls: ['./add-cart.component.less'] +}) +export class AddCartComponent implements OnInit { + data = []; + selectedData: any[] = []; + @ViewChild('st', { static: true }) + st!: STComponent; + @ViewChild('sf', { static: false }) + sf!: SFComponent; + columns: STColumn[] = [ + { title: '', index: 'key', type: 'checkbox' }, + { title: '车牌号', index: 'no' }, + { title: '车辆所有人', index: 'callNo' } + ]; + searchSchema: SFSchema = { + properties: { + params1: { + title: '', + type: 'string', + ui: { + placeholder: '请输入车牌号' + } + }, + params2: { + title: '', + type: 'string', + ui: { + placeholder: '请输入车辆所有人' + } + }, + } + }; + + constructor(public service: TicketService, private nzModalService: NzModalService, private router: Router) {} + + ngOnInit(): void {} + + beforeReq = (requestOptions: STRequestOptions) => { + if (this.sf) { + Object.assign(requestOptions.body, { + ...this.sf.value + }); + } + return requestOptions; + }; + + stChange(e: STChange): void { + switch (e.type) { + case 'checkbox': + this.selectedData = e.checkbox!; + break; + } + } + + /** + * 重置表单 + */ + resetSF() { + this.sf.reset(); + } +} diff --git a/src/app/routes/ticket-management/components/etc-blacklist/add-owner/add-owner.component.html b/src/app/routes/ticket-management/components/etc-blacklist/add-owner/add-owner.component.html new file mode 100644 index 00000000..d862483c --- /dev/null +++ b/src/app/routes/ticket-management/components/etc-blacklist/add-owner/add-owner.component.html @@ -0,0 +1,16 @@ +
+
+ +
+
+ + +
+ + +
\ No newline at end of file diff --git a/src/app/routes/ticket-management/components/etc-blacklist/add-owner/add-owner.component.less b/src/app/routes/ticket-management/components/etc-blacklist/add-owner/add-owner.component.less new file mode 100644 index 00000000..e69de29b diff --git a/src/app/routes/ticket-management/components/etc-blacklist/add-owner/add-owner.component.ts b/src/app/routes/ticket-management/components/etc-blacklist/add-owner/add-owner.component.ts new file mode 100644 index 00000000..d5dc8e27 --- /dev/null +++ b/src/app/routes/ticket-management/components/etc-blacklist/add-owner/add-owner.component.ts @@ -0,0 +1,80 @@ +import { Component, OnInit, ViewChild } from '@angular/core'; +import { Router } from '@angular/router'; +import { STComponent, STColumn, STRequestOptions, STChange } from '@delon/abc/st'; +import { SFComponent, SFSchema, SFDateWidgetSchema } from '@delon/form'; +import { NzModalService } from 'ng-zorro-antd/modal'; +import { TicketService } from '../../../services/ticket.service'; + +@Component({ + selector: 'app-add-owner', + templateUrl: './add-owner.component.html', + styleUrls: ['./add-owner.component.less'] +}) +export class AddOwnerComponent implements OnInit { + data = []; + selectedData: any[] = []; + @ViewChild('st', { static: true }) + st!: STComponent; + @ViewChild('sf', { static: false }) + sf!: SFComponent; + columns: STColumn[] = [ + { title: '', index: 'key', type: 'checkbox' }, + { title: '企业名称', index: 'no' }, + { title: '联系人姓名', index: 'callNo' }, + { title: '联系人手机号', index: 'callNo' }, + { title: '认证状态', index: 'callNo' } + ]; + searchSchema: SFSchema = { + properties: { + params1: { + title: '', + type: 'string', + ui: { + placeholder: '请输入企业名称' + } + }, + params2: { + title: '', + type: 'string', + ui: { + placeholder: '请输入姓名' + } + }, + params3: { + title: '', + type: 'string', + ui: { + placeholder: '请输入手机号' + } + } + } + }; + + constructor(public service: TicketService, private nzModalService: NzModalService, private router: Router) {} + + ngOnInit(): void {} + + beforeReq = (requestOptions: STRequestOptions) => { + if (this.sf) { + Object.assign(requestOptions.body, { + ...this.sf.value + }); + } + return requestOptions; + }; + + stChange(e: STChange): void { + switch (e.type) { + case 'checkbox': + this.selectedData = e.checkbox!; + break; + } + } + + /** + * 重置表单 + */ + resetSF() { + this.sf.reset(); + } +} diff --git a/src/app/routes/ticket-management/components/etc-blacklist/etc-blacklist.component.html b/src/app/routes/ticket-management/components/etc-blacklist/etc-blacklist.component.html index 92392afc..0486b87c 100644 --- a/src/app/routes/ticket-management/components/etc-blacklist/etc-blacklist.component.html +++ b/src/app/routes/ticket-management/components/etc-blacklist/etc-blacklist.component.html @@ -1,4 +1,4 @@ - + @@ -10,7 +10,7 @@
@@ -23,16 +23,16 @@
- - + +
已选择 - {{ selectedRows.length }} 条删除 + {{ selectedRows.length }} 条数据 清空
- diff --git a/src/app/routes/ticket-management/components/etc-blacklist/etc-blacklist.component.less b/src/app/routes/ticket-management/components/etc-blacklist/etc-blacklist.component.less index 72efc9a9..20e631b8 100644 --- a/src/app/routes/ticket-management/components/etc-blacklist/etc-blacklist.component.less +++ b/src/app/routes/ticket-management/components/etc-blacklist/etc-blacklist.component.less @@ -1,15 +1,4 @@ :host::ng-deep { - .search-box { - .ant-card-body { - padding-bottom: 18px; - } - } - - .content-box { - .ant-card-body { - padding-top: 14px; - } - } .tabs-wrap>.ant-tabs-nav { margin-bottom: 0; diff --git a/src/app/routes/ticket-management/components/etc-blacklist/etc-blacklist.component.ts b/src/app/routes/ticket-management/components/etc-blacklist/etc-blacklist.component.ts index 02f22239..9d8e89e6 100644 --- a/src/app/routes/ticket-management/components/etc-blacklist/etc-blacklist.component.ts +++ b/src/app/routes/ticket-management/components/etc-blacklist/etc-blacklist.component.ts @@ -1,13 +1,16 @@ import { Component, OnInit, ViewChild } from '@angular/core'; -import { STComponent, STColumn, STChange } from '@delon/abc/st'; +import { STComponent, STColumn, STChange, STRequestOptions } from '@delon/abc/st'; import { SFComponent, SFSchema } from '@delon/form'; import { NzModalService } from 'ng-zorro-antd/modal'; import { SystemService } from 'src/app/routes/sys-setting/services/system.service'; +import { TicketService } from '../../services/ticket.service'; +import { AddCartComponent } from './add-cart/add-cart.component'; +import { AddOwnerComponent } from './add-owner/add-owner.component'; @Component({ selector: 'app-etc-blacklist', templateUrl: './etc-blacklist.component.html', - styleUrls: ['./etc-blacklist.component.less'] + styleUrls: ['../../../commom/less/box.less', './etc-blacklist.component.less'] }) export class ETCBlacklistComponent implements OnInit { @ViewChild('st', { static: true }) @@ -27,128 +30,32 @@ export class ETCBlacklistComponent implements OnInit { } ]; tabType = 1; - url = `/rule?_allow_anonymous=true`; - searchSchema: SFSchema = { - properties: { - tabType: { - type: 'number', - ui: { - hidden: true - } - }, - params1: { - title: '企业名称', - type: 'string', - ui: { - placeholder: '请输入', - visibleIf: { - tabType: (value: number) => this.tabType === 1 - } - } - }, - params2: { - title: '联系人姓名', - type: 'string', - ui: { - placeholder: '姓名/手机/车牌号', - visibleIf: { - tabType: (value: number) => this.tabType === 1 - } - } - }, - params3: { - title: '手机号', - type: 'string', - ui: { - placeholder: '请输入', - visibleIf: { - tabType: (value: number) => this.tabType === 1 - } - } - }, - params4: { - title: '车牌号', - type: 'string', - ui: { - placeholder: '请输入', - visibleIf: { - tabType: (value: number) => this.tabType === 2 - } - } - }, - params5: { - title: '司机姓名', - type: 'string', - ui: { - placeholder: '请输入', - visibleIf: { - tabType: (value: number) => this.tabType === 2 - } - } - }, - params6: { - title: '手机号', - type: 'string', - ui: { - placeholder: '请输入', - visibleIf: { - tabType: (value: number) => this.tabType === 2 - } - } - } - } - }; + searchSchema: SFSchema = this.initSF(); - columns: STColumn[] = [ - { title: '', index: 'key', type: 'checkbox' }, - { title: '企业名称', index: 'no', iif: () => this.tabType === 1 }, - { title: '联系人姓名', index: 'no', iif: () => this.tabType === 1 }, - { title: '车牌号', index: 'no', iif: () => this.tabType === 2 }, - { title: '司机姓名', index: 'no', iif: () => this.tabType === 2 }, - { title: '手机号', index: 'no' }, - { - title: '认证状态', - className: 'text-center', - index: 'status', - type: 'badge', - badge: { - 0: { text: '启用', color: 'success' }, - 2: { text: '禁用', color: 'error' }, - 3: { text: '禁用', color: 'error' }, - 1: { text: '禁用', color: 'error' } - } - }, - { title: '创建者', index: 'no' }, - { - title: '创建时间', - index: 'updatedAt', - type: 'date' - }, - { - title: '操作', - buttons: [ - { - text: '删除', - click: item => this.deleteAction(item) - } - ] - } - ]; + columns: STColumn[] = this.initST(); selectedRows: any[] = []; - reqParams = { pageIndex: 1, pageSize: 10 }; - - constructor(public service: SystemService, private nzModalService: NzModalService) {} + constructor(public service: TicketService, private nzModalService: NzModalService) {} ngOnInit(): void {} + beforeReq = (requestOptions: STRequestOptions) => { + if (this.sf) { + Object.assign(requestOptions.body, { + ...this.sf.value + }); + } + return requestOptions; + }; + // 切换Tab changeTab(item: any) { this.tabType = item.type; this.sf?.setValue('/tabType', item.type); this.sf?.reset(); + this.selectedRows = []; setTimeout(() => { this.tabs.forEach(i => (i.isActived = false)); item.isActived = !item.isActived; @@ -162,20 +69,58 @@ export class ETCBlacklistComponent implements OnInit { case 'checkbox': this.selectedRows = e.checkbox!; break; - case 'filter': - this.st.load(); - break; } } - configAction(item?: any) {} + configAction(item?: any) { + if (this.tabType === 1) { + this.addOwnerAction(item); + } else { + this.addCartAction(item); + } + } + + addOwnerAction(item: any) { + const modal = this.nzModalService.create({ + nzTitle: '选择货主', + nzContent: AddOwnerComponent, + nzWidth: 850, + nzComponentParams: { data: [] }, + nzOnOk: com => { + console.log(com.selectedData); + } + }); + modal.afterClose.subscribe(res => { + if (res) { + this.st.load(); + } + }); + } + + addCartAction(item: any) { + const modal = this.nzModalService.create({ + nzTitle: '选择车辆', + nzContent: AddCartComponent, + nzWidth: 700, + nzComponentParams: { data: [] }, + nzOnOk: com => { + console.log(com.selectedData); + } + }); + modal.afterClose.subscribe(res => { + if (res) { + this.st.load(); + } + }); + } deleteAction(item?: any) { - this.nzModalService.error({ - nzTitle: '确认删除？', + this.nzModalService.warning({ + nzTitle: this.tabType === 1 ? '确定将所选货主从ETC白名单中剔除？' : '确定将所选车辆从ETC白名单中剔除？', nzClosable: false, nzCancelText: '取消', - nzOnOk: () => {} + nzOnOk: () => {}, + nzOkText: '确定' }); } /** @@ -184,4 +129,116 @@ export class ETCBlacklistComponent implements OnInit { resetSF() { this.sf.reset(); } + + private initSF(): SFSchema { + return { + properties: { + tabType: { + type: 'number', + ui: { + hidden: true + } + }, + params1: { + title: '企业名称', + type: 'string', + ui: { + placeholder: '请输入', + visibleIf: { + tabType: (value: number) => this.tabType === 1 + } + } + }, + params2: { + title: '联系人姓名', + type: 'string', + ui: { + placeholder: '姓名/手机/车牌号', + visibleIf: { + tabType: (value: number) => this.tabType === 1 + } + } + }, + params3: { + title: '联系人手机号', + type: 'string', + ui: { + placeholder: '请输入', + visibleIf: { + tabType: (value: number) => this.tabType === 1 + } + } + }, + params4: { + title: '车牌号', + type: 'string', + ui: { + placeholder: '请输入', + visibleIf: { + tabType: (value: number) => this.tabType === 2 + } + } + }, + params5: { + title: '司机姓名', + type: 'string', + ui: { + placeholder: '请输入', + visibleIf: { + tabType: (value: number) => this.tabType === 2 + } + } + }, + params6: { + title: '手机号', + type: 'string', + ui: { + placeholder: '请输入', + visibleIf: { + tabType: (value: number) => this.tabType === 2 + } + } + } + } + }; + } + + private initST(): STColumn[] { + return [ + { title: '', index: 'key', type: 'checkbox' }, + { title: '企业名称', index: 'no', iif: () => this.tabType === 1 }, + { title: '联系人姓名', index: 'no', iif: () => this.tabType === 1 }, + { title: '联系人手机号', index: 'no' }, + { + title: '认证状态', + className: 'text-center', + index: 'status', + type: 'badge', + badge: { + 0: { text: '启用', color: 'success' }, + 2: { text: '禁用', color: 'error' }, + 3: { text: '禁用', color: 'error' }, + 1: { text: '禁用', color: 'error' } + }, + iif: () => this.tabType === 1 + }, + { title: '车牌号', index: 'no', iif: () => this.tabType === 2 }, + { title: '车辆所有人', index: 'no', iif: () => this.tabType === 2 }, + { title: '创建者', index: 'no' }, + { + title: '创建时间', + index: 'updatedAt', + type: 'date' + }, + { + title: '操作', + buttons: [ + { + text: '删除', + click: item => this.deleteAction(item) + } + ] + } + ]; + } } diff --git a/src/app/routes/ticket-management/components/etc-invoiced-list/etc-invoiced-list.component.html b/src/app/routes/ticket-management/components/etc-invoiced-list/etc-invoiced-list.component.html index 94082590..1681af33 100644 --- a/src/app/routes/ticket-management/components/etc-invoiced-list/etc-invoiced-list.component.html +++ b/src/app/routes/ticket-management/components/etc-invoiced-list/etc-invoiced-list.component.html @@ -3,24 +3,35 @@
-
+
-
+
+
- + [loading]="service.http.loading" [scroll]="{ x:'1200px',y: '400px' }"> + + 张三
13812345678 + + + 粤B88888
张三 + + \ No newline at end of file diff --git a/src/app/routes/ticket-management/components/etc-invoiced-list/etc-invoiced-list.component.less b/src/app/routes/ticket-management/components/etc-invoiced-list/etc-invoiced-list.component.less deleted file mode 100644 index a3fa49cc..00000000 --- a/src/app/routes/ticket-management/components/etc-invoiced-list/etc-invoiced-list.component.less +++ /dev/null @@ -1,13 +0,0 @@ -:host::ng-deep { - .search-box { - .ant-card-body { - padding-bottom: 18px; - } - } - - .content-box { - .ant-card-body { - padding-top: 16px; - } - } -} \ No newline at end of file diff --git a/src/app/routes/ticket-management/components/etc-invoiced-list/etc-invoiced-list.component.ts b/src/app/routes/ticket-management/components/etc-invoiced-list/etc-invoiced-list.component.ts index 4743a570..ff3c66dc 100644 --- a/src/app/routes/ticket-management/components/etc-invoiced-list/etc-invoiced-list.component.ts +++ b/src/app/routes/ticket-management/components/etc-invoiced-list/etc-invoiced-list.component.ts @@ -1,6 +1,6 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { Router } from '@angular/router'; -import { STComponent, STColumn, STChange } from '@delon/abc/st'; +import { STComponent, STColumn, STChange, STRequestOptions } from '@delon/abc/st'; import { SFComponent, SFSchema } from '@delon/form'; import { NzModalService } from 'ng-zorro-antd/modal'; import { TicketService } from '../../services/ticket.service'; @@ -9,107 +9,35 @@ import { TransactionDetailsComponent } from './transaction-details/transaction-d @Component({ selector: 'app-etc-invoiced-list', templateUrl: './etc-invoiced-list.component.html', - styleUrls: ['./etc-invoiced-list.component.less'] + styleUrls: ['../../../commom/less/box.less'] }) export class ETCInvoicedListComponent implements OnInit { - url = `/rule?_allow_anonymous=true`; @ViewChild('st', { static: true }) st!: STComponent; @ViewChild('sf', { static: false }) sf!: SFComponent; - columns: STColumn[] = [ - { title: '运单号', index: 'no' }, - { title: '开票状态', index: 'callNo' }, - { title: '业务方', index: 'callNo' }, - { title: '业务方税号', index: 'callNo' }, - { title: '开票金额', index: 'callNo' }, - { title: '发票张数', index: 'callNo' }, - { title: '申请时间', index: 'updatedAt', type: 'date' }, - { - title: '操作', - buttons: [ - { - text: '交易明细', - click: item => this.showDetail(item) - } - ] - } - ]; - searchSchema: SFSchema = { - properties: { - orderSn: { - type: 'string', - title: '运单号', - ui: { - autocomplete: 'off' - } - }, - receiveName: { - type: 'string', - title: '开票状态', - enum: [ - { label: '全部', value: '' }, - { label: '待受理', value: '待受理' }, - { label: '待开票', value: '待开票' }, - { label: '开票中', value: '开票中' }, - { label: '已开票', value: '已开票' }, - { label: '已撤销', value: '已撤销' }, - { label: '已拒绝', value: '已拒绝' } - ], - ui: { - widget: 'select', - placeholder: '请选择', - change: (i: any) => { - this.sf.value.receiveName = i; - this.sf?.setValue('/receiveName', i); - } - }, - default: '' - }, - receiveName2: { - type: 'string', - title: '业务方', - enum: [ - { label: '全部', value: '' }, - { label: '待受理', value: '待受理' }, - { label: '待开票', value: '待开票' }, - { label: '开票中', value: '开票中' }, - { label: '已开票', value: '已开票' }, - { label: '已撤销', value: '已撤销' }, - { label: '已拒绝', value: '已拒绝' } - ], - ui: { - widget: 'select', - placeholder: '请选择', - change: (i: any) => { - this.sf.value.receiveName = i; - this.sf?.setValue('/receiveName', i); - } - }, - default: '' - } - } - }; - - reqParams = {}; + columns: STColumn[] = this.initST(); + searchSchema: SFSchema = this.initSF(); + _$expand = false; constructor(public service: TicketService, private nzModalService: NzModalService, private router: Router) {} ngOnInit(): void {} - stChange(e: STChange): void { - switch (e.type) { - case 'filter': - this.st.load(); - break; + beforeReq = (requestOptions: STRequestOptions) => { + if (this.sf) { + Object.assign(requestOptions.body, { + ...this.sf.value + }); } - } + return requestOptions; + }; showDetail(item: any) { const modal = this.nzModalService.create({ nzTitle: '运单交易明细', nzContent: TransactionDetailsComponent, - nzWidth: 800, + nzWidth: 900, nzComponentParams: { data: [] }, nzOnOk: com => { console.log(com.selectedData); @@ -126,5 +54,117 @@ export class ETCInvoicedListComponent implements OnInit { */ resetSF() { this.sf.reset(); + this._$expand = false; + } + + /** + * 伸缩查询条件 + */ + expandToggle() { + this._$expand = !this._$expand; + this.sf?.setValue('/expand', this._$expand); + } + + private initSF(): SFSchema { + return { + properties: { + expand: { + type: 'boolean', + ui: { + hidden: true + } + }, + orderSn: { + type: 'string', + title: '运单号', + ui: { + autocomplete: 'off' + } + }, + order2Sn: { + type: 'string', + title: '订单号', + ui: { + autocomplete: 'off' + } + }, + order2S2n: { + type: 'string', + title: '订单类型', + ui: { + widget: 'dict-select', + params: { dictKey: 'refund:apply:status' }, + placeholder: '请选择' + } + }, + receiveName: { + type: 'string', + title: '开票状态', + ui: { + widget: 'dict-select', + params: { dictKey: 'refund:apply:status' }, + placeholder: '请选择', + visibleIf: { + expand: (value: boolean) => value + } + }, + default: '' + }, + receiveName2: { + type: 'string', + title: '托运人', + enum: [{ label: '全部', value: '' }], + ui: { + widget: 'select', + placeholder: '请选择', + visibleIf: { + expand: (value: boolean) => value + } + }, + default: '' + }, + ltdId: { + type: 'string', + title: '网络货运人', + ui: { + widget: 'select', + placeholder: '请选择', + allowClear: true, + visibleIf: { + expand: (value: boolean) => value + }, + asyncData: () => this.service.getNetworkFreightForwarder() + }, + default: '' + } + } + }; + } + + private initST(): STColumn[] { + return [ + { title: '运单号', index: 'no' }, + { title: '订单号', index: 'no' }, + { title: '开票状态', index: 'callNo' }, + { title: '订单类型', index: 'callNo' }, + { title: '装货地', index: 'callNo' }, + { title: '卸货地', index: 'callNo' }, + { title: '司机信息', render: 'call1No' }, + { title: '车辆信息', render: 'call12No' }, + { title: '托运人', index: 'callNo' }, + { title: '网络货运人', index: 'callNo' }, + { title: '开票金额', index: 'callNo' }, + { title: '开票张数', index: 'callNo' }, + { title: '申请时间', index: 'updatedAt', type: 'date' }, + { + title: '操作', + buttons: [ + { + text: '交易明细', + click: item => this.showDetail(item) + } + ] + } + ]; } } diff --git a/src/app/routes/ticket-management/components/etc-invoiced-list/transaction-details/transaction-details.component.html b/src/app/routes/ticket-management/components/etc-invoiced-list/transaction-details/transaction-details.component.html index a0704a71..ef4d003f 100644 --- a/src/app/routes/ticket-management/components/etc-invoiced-list/transaction-details/transaction-details.component.html +++ b/src/app/routes/ticket-management/components/etc-invoiced-list/transaction-details/transaction-details.component.html @@ -9,8 +9,8 @@
+ [loading]="service.http.loading" [scroll]="{ x:'860px',y: '400px' }">
\ No newline at end of file diff --git a/src/app/routes/ticket-management/components/etc-invoiced-list/transaction-details/transaction-details.component.ts b/src/app/routes/ticket-management/components/etc-invoiced-list/transaction-details/transaction-details.component.ts index 1e1c31c3..2ab85061 100644 --- a/src/app/routes/ticket-management/components/etc-invoiced-list/transaction-details/transaction-details.component.ts +++ b/src/app/routes/ticket-management/components/etc-invoiced-list/transaction-details/transaction-details.component.ts @@ -1,14 +1,13 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { Router } from '@angular/router'; -import { STComponent, STColumn, STChange } from '@delon/abc/st'; +import { STComponent, STColumn, STChange, STRequestOptions } from '@delon/abc/st'; import { SFComponent, SFDateWidgetSchema, SFSchema } from '@delon/form'; import { NzModalService } from 'ng-zorro-antd/modal'; import { TicketService } from '../../../services/ticket.service'; @Component({ selector: 'app-transaction-details', - templateUrl: './transaction-details.component.html', - styleUrls: ['./transaction-details.component.less'] + templateUrl: './transaction-details.component.html' }) export class TransactionDetailsComponent implements OnInit { data = []; @@ -41,11 +40,7 @@ export class TransactionDetailsComponent implements OnInit { ], ui: { widget: 'select', - placeholder: '请选择', - change: (i: any) => { - this.sf.value.receiveName = i; - this.sf?.setValue('/receiveName', i); - } + placeholder: '请选择' }, default: '' }, @@ -53,8 +48,7 @@ export class TransactionDetailsComponent implements OnInit { title: '交易时间', type: 'string', ui: { - widget: 'date', - mode: 'range', + widget: 'sl-from-to-search', format: 'yyyy-MM-dd' } as SFDateWidgetSchema } @@ -67,13 +61,14 @@ export class TransactionDetailsComponent implements OnInit { ngOnInit(): void {} - stChange(e: STChange): void { - switch (e.type) { - case 'filter': - this.st.load(); - break; + beforeReq = (requestOptions: STRequestOptions) => { + if (this.sf) { + Object.assign(requestOptions.body, { + ...this.sf.value + }); } - } + return requestOptions; + }; /** * 重置表单 diff --git a/src/app/routes/ticket-management/components/etc-invoiced-logs/etc-invoiced-logs.component.html b/src/app/routes/ticket-management/components/etc-invoiced-logs/etc-invoiced-logs.component.html index c2ed8caa..358a2075 100644 --- a/src/app/routes/ticket-management/components/etc-invoiced-logs/etc-invoiced-logs.component.html +++ b/src/app/routes/ticket-management/components/etc-invoiced-logs/etc-invoiced-logs.component.html @@ -6,7 +6,7 @@
- + [loading]="service.http.loading" [scroll]="{ x:'1200px',y: '370px' }"> + + 特朗普
13789040523 + + \ No newline at end of file diff --git a/src/app/routes/ticket-management/components/etc-invoiced-logs/etc-invoiced-logs.component.ts b/src/app/routes/ticket-management/components/etc-invoiced-logs/etc-invoiced-logs.component.ts index 64c52034..2a6020f6 100644 --- a/src/app/routes/ticket-management/components/etc-invoiced-logs/etc-invoiced-logs.component.ts +++ b/src/app/routes/ticket-management/components/etc-invoiced-logs/etc-invoiced-logs.component.ts @@ -1,6 +1,6 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { Router } from '@angular/router'; -import { STComponent, STColumn, STChange } from '@delon/abc/st'; +import { STComponent, STColumn, STChange, STRequestOptions } from '@delon/abc/st'; import { SFComponent, SFSchema, SFDateWidgetSchema } from '@delon/form'; import { NzModalService } from 'ng-zorro-antd/modal'; import { TicketService } from '../../services/ticket.service'; @@ -8,135 +8,15 @@ import { TicketService } from '../../services/ticket.service'; @Component({ selector: 'app-etc-invoiced-logs', templateUrl: './etc-invoiced-logs.component.html', - styleUrls: ['./etc-invoiced-logs.component.less'] + styleUrls: ['../../../commom/less/box.less', '../../../commom/less/expend-but.less'] }) export class ETCInvoicedLogsComponent implements OnInit { - url = `/rule?_allow_anonymous=true`; @ViewChild('st', { static: true }) st!: STComponent; @ViewChild('sf', { static: false }) sf!: SFComponent; - columns: STColumn[] = [ - { title: '发票号码', index: 'no' }, - { title: '发票代码', index: 'callNo' }, - { title: '运单号', index: 'callNo' }, - { title: '车牌号', index: 'callNo' }, - { title: '入站口', index: 'callNo' }, - { title: '出站口', index: 'callNo' }, - { title: '里程（km）', index: 'callNo' }, - { title: '交易id', index: 'callNo' }, - { title: '交易金额（元）', index: 'callNo' }, - { title: '发票金额（元）', index: 'callNo' }, - { title: '税率', index: 'callNo' }, - { title: '税额（元）', index: 'callNo' }, - { title: '价税合计（元）', index: 'callNo' }, - { title: '交易时间', index: 'updatedAt', type: 'date' }, - { title: '开票日期', index: 'updatedAt', type: 'date' }, - { title: '购买方', index: 'callNo' }, - { title: '购方税号', index: 'callNo' }, - { title: '销售方', index: 'callNo' }, - { title: '销方税号', index: 'callNo' } - ]; - searchSchema: SFSchema = { - properties: { - expand: { - type: 'boolean', - ui: { - hidden: true - } - }, - orderSn: { - type: 'string', - title: '发票号码', - ui: { - placeholder: '请输入', - autocomplete: 'off' - } - }, - orderSn1: { - type: 'string', - title: '运单号', - ui: { - placeholder: '请输入', - autocomplete: 'off' - } - }, - orderSn2: { - type: 'string', - title: '车牌号', - ui: { - placeholder: '请输入', - autocomplete: 'off' - } - }, - createTime: { - title: '交易时间', - type: 'string', - ui: { - widget: 'date', - mode: 'range', - format: 'yyyy-MM-dd', - visibleIf: { - expand: (value: boolean) => value - } - } as SFDateWidgetSchema - }, - createTime2: { - title: '开票日期', - type: 'string', - ui: { - widget: 'date', - mode: 'range', - format: 'yyyy-MM-dd', - visibleIf: { - expand: (value: boolean) => value - } - } as SFDateWidgetSchema - }, - receiveName: { - type: 'string', - title: '购买方', - enum: [ - { label: '全部', value: '全部' }, - { label: '企业认证审核', value: '企业认证审核' }, - { label: '企业管理员审核', value: '企业管理员审核' } - ], - ui: { - widget: 'select', - placeholder: '请选择', - change: (i: any) => { - this.sf.value.receiveName = i; - this.sf?.setValue('/receiveName', i); - }, - visibleIf: { - expand: (value: boolean) => value - } - } - }, - receiveName2: { - type: 'string', - title: '销售方', - enum: [ - { label: '全部', value: '全部' }, - { label: '企业认证审核', value: '企业认证审核' }, - { label: '企业管理员审核', value: '企业管理员审核' } - ], - ui: { - widget: 'select', - placeholder: '请选择', - change: (i: any) => { - this.sf.value.receiveName2 = i; - this.sf?.setValue('/receiveName2', i); - }, - visibleIf: { - expand: (value: boolean) => value - } - } - } - } - }; - - reqParams = {}; + columns: STColumn[] = this.initST(); + searchSchema: SFSchema = this.initSF(); _$expand = false; @@ -144,19 +24,17 @@ export class ETCInvoicedLogsComponent implements OnInit { ngOnInit(): void {} - stChange(e: STChange): void { - switch (e.type) { - case 'filter': - this.st.load(); - break; + beforeReq = (requestOptions: STRequestOptions) => { + if (this.sf) { + Object.assign(requestOptions.body, { + ...this.sf.value + }); } - } - - approval(): void {} - - add(): void {} + return requestOptions; + }; routeTo(item: any) { + return; this.router.navigate(['/ticket/invoice-requested-detail/1']); } @@ -175,4 +53,121 @@ export class ETCInvoicedLogsComponent implements OnInit { this._$expand = !this._$expand; this.sf?.setValue('/expand', this._$expand); } + + private initSF(): SFSchema { + return { + properties: { + expand: { + type: 'boolean', + ui: { + hidden: true + } + }, + orderSn: { + type: 'string', + title: '发票号码', + ui: { + placeholder: '请输入', + autocomplete: 'off' + } + }, + orderS2n1: { + type: 'string', + title: '订单号', + ui: { + placeholder: '请输入' + } + }, + orderSn1: { + type: 'string', + title: '运单号', + ui: { + placeholder: '请输入' + } + }, + orderSn2: { + type: 'string', + title: '车牌号', + ui: { + placeholder: '请输入', + visibleIf: { + expand: (value: boolean) => value + } + } + }, + createTime: { + title: '交易时间', + type: 'string', + ui: { + widget: 'sl-from-to-search', + format: 'yyyy-MM-dd', + visibleIf: { + expand: (value: boolean) => value + } + } as SFDateWidgetSchema + }, + createTime2: { + title: '开票日期', + type: 'string', + ui: { + widget: 'sl-from-to-search', + format: 'yyyy-MM-dd', + visibleIf: { + expand: (value: boolean) => value + } + } as SFDateWidgetSchema + }, + receiveName2: { + type: 'string', + title: '销售方', + enum: [{ label: '全部', value: '全部' }], + ui: { + widget: 'select', + placeholder: '请选择', + visibleIf: { + expand: (value: boolean) => value + } + } + }, + ltdId: { + type: 'string', + title: '网络货运人', + ui: { + widget: 'select', + placeholder: '请选择', + allowClear: true, + visibleIf: { + expand: (value: boolean) => value + }, + asyncData: () => this.service.getNetworkFreightForwarder() + }, + default: '' + } + } + }; + } + + private initST(): STColumn[] { + return [ + { title: '发票号码', index: 'no', width: 100, type: 'link', click: item => this.routeTo(item) }, + { title: '发票代码', index: 'callNo', width: 100 }, + { title: '订单号', index: 'callNo', width: 100 }, + { title: '运单号', index: 'callNo', width: 100 }, + { title: '入站口', index: 'callNo', width: 100 }, + { title: '出站口', index: 'callNo', width: 100 }, + { title: '司机', render: 'call3No', width: 140 }, + { title: '车牌号', index: 'callNo', width: 100 }, + { title: '里程（km）', index: 'callNo', width: 120 }, + { title: '交易id', index: 'callNo', width: 100 }, + { title: '交易金额（元）', index: 'callNo', width: 130 }, + { title: '税率', index: 'callNo', width: 90 }, + { title: '金额（元）', index: 'callNo', width: 120 }, + { title: '税额（元）', index: 'callNo', width: 120 }, + { title: '价税合计（元）', index: 'callNo', width: 130 }, + { title: '交易时间', index: 'updatedAt', type: 'date', width: 150 }, + { title: '开票日期', index: 'updatedAt', type: 'date', width: 150 }, + { title: '销售方', index: 'callNo', width: 90 }, + { title: '网络货运人', index: 'callNo', width: 120 } + ]; + } } diff --git a/src/app/routes/ticket-management/components/etc-invoiced-requested/etc-invoiced-requested.component.html b/src/app/routes/ticket-management/components/etc-invoiced-requested/etc-invoiced-requested.component.html index d7896ee5..209784ce 100644 --- a/src/app/routes/ticket-management/components/etc-invoiced-requested/etc-invoiced-requested.component.html +++ b/src/app/routes/ticket-management/components/etc-invoiced-requested/etc-invoiced-requested.component.html @@ -1,7 +1,6 @@ -
@@ -25,7 +24,7 @@
- +
已选择 {{ selectedRows.length }} 条运单 @@ -33,20 +32,16 @@
- - - - -
-
- - - -
-
- \ No newline at end of file + [loading]="service.http.loading" [scroll]="{ x:'1200px',y: '370px' }" (change)="stChange($event)"> + + 张三
13812345678 + + + 粤B88888
张三 + + + \ No newline at end of file diff --git a/src/app/routes/ticket-management/components/etc-invoiced-requested/etc-invoiced-requested.component.ts b/src/app/routes/ticket-management/components/etc-invoiced-requested/etc-invoiced-requested.component.ts index 8b4b0eff..d391826b 100644 --- a/src/app/routes/ticket-management/components/etc-invoiced-requested/etc-invoiced-requested.component.ts +++ b/src/app/routes/ticket-management/components/etc-invoiced-requested/etc-invoiced-requested.component.ts @@ -1,6 +1,6 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { Router } from '@angular/router'; -import { STComponent, STColumn, STChange } from '@delon/abc/st'; +import { STComponent, STColumn, STChange, STRequestOptions } from '@delon/abc/st'; import { SFComponent, SFSchema, SFDateWidgetSchema } from '@delon/form'; import { NzModalService } from 'ng-zorro-antd/modal'; import { TicketService } from '../../services/ticket.service'; @@ -8,127 +8,17 @@ import { TicketService } from '../../services/ticket.service'; @Component({ selector: 'app-etc-invoiced-requested', templateUrl: './etc-invoiced-requested.component.html', - styleUrls: ['./etc-invoiced-requested.component.less'] + styleUrls: ['../../../commom/less/box.less', '../../../commom/less/expend-but.less'] }) export class ETCInvoicedRequestedComponent implements OnInit { - url = `/rule?_allow_anonymous=true`; @ViewChild('st', { static: true }) st!: STComponent; @ViewChild('sf', { static: false }) sf!: SFComponent; @ViewChild('auditModal', { static: false }) auditModal!: any; - columns: STColumn[] = [ - { title: '', index: 'key', type: 'checkbox' }, - { title: '运单号', index: 'no' }, - { title: '司机', index: 'callNo' }, - { title: '装货地', index: 'callNo' }, - { title: '卸货地', index: 'callNo' }, - { title: '托运人', index: 'callNo' }, - { title: '无车承运人', index: 'callNo' }, - { title: '派车时间', index: 'updatedAt', type: 'date' }, - { title: '提货时间', index: 'updatedAt', type: 'date' }, - { title: '卸货时间', index: 'updatedAt', type: 'date' }, - { title: '签收时间', index: 'updatedAt', type: 'date' }, - ]; - searchSchema: SFSchema = { - properties: { - expand: { - type: 'boolean', - ui: { - hidden: true - } - }, - orderSn: { - type: 'string', - title: '运单号', - ui: { - autocomplete: 'off', - placeholder: '请输入' - } - }, - orderSn1: { - type: 'string', - title: '司机', - ui: { - autocomplete: 'off', - placeholder: '姓名/手机' - } - }, - orderSn2: { - type: 'string', - title: '车牌号', - ui: { - autocomplete: 'off', - placeholder: '请输入' - } - }, - orderS3: { - type: 'string', - title: '卸货地', - ui: { - autocomplete: 'off', - placeholder: '请选择', - visibleIf: { - expand: (value: boolean) => value - } - } - }, - orderSn4: { - type: 'string', - title: '装货地', - ui: { - autocomplete: 'off', - placeholder: '请选择', - visibleIf: { - expand: (value: boolean) => value - } - } - }, - orderSn5: { - type: 'string', - title: '托运人', - enum: [ - { label: '全部', value: '全部' }, - { label: '企业认证审核', value: '企业认证审核' }, - { label: '企业管理员审核', value: '企业管理员审核' } - ], - ui: { - widget: 'select', - placeholder: '请选择', - change: (i: any) => { - this.sf.value.receiveName = i; - this.sf?.setValue('/receiveName', i); - }, - visibleIf: { - expand: (value: boolean) => value - } - } - }, - receiveName: { - type: 'string', - title: '无车承运人', - enum: [ - { label: '全部', value: '全部' }, - { label: '企业认证审核', value: '企业认证审核' }, - { label: '企业管理员审核', value: '企业管理员审核' } - ], - ui: { - widget: 'select', - placeholder: '请选择', - change: (i: any) => { - this.sf.value.receiveName = i; - this.sf?.setValue('/receiveName', i); - }, - visibleIf: { - expand: (value: boolean) => value - } - } - } - } - }; - - reqParams = {}; + columns: STColumn[] = this.initST(); + searchSchema: SFSchema = this.initSF(); _$expand = false; @@ -137,64 +27,31 @@ export class ETCInvoicedRequestedComponent implements OnInit { ngOnInit(): void {} + beforeReq = (requestOptions: STRequestOptions) => { + if (this.sf) { + Object.assign(requestOptions.body, { + ...this.sf.value + }); + } + return requestOptions; + }; + stChange(e: STChange): void { switch (e.type) { case 'checkbox': this.selectedRows = e.checkbox!; break; - case 'filter': - this.st.load(); - break; } } - approval(): void {} - - add(): void {} - - routeTo(item: any) { - this.router.navigate(['/ticket/invoice-requested-detail/1']); - } - - auditAction(item: any) { - const modal = this.nzModalService.create({ - nzTitle: '审核', - nzContent: this.auditModal, - nzFooter: [ - { - label: '拒绝', - type: 'default', - onClick: () => { - modal.destroy(); - } - }, - { - label: '通过', - type: 'primary', - onClick: () => { - modal.destroy(); - } - } - ] - }); - modal.afterClose.subscribe(res => { - this.st.load(); - }); - } - - showReason(item: any) { - const modal = this.nzModalService.create({ - nzTitle: '查看原因', - nzContent: '运单数据异常，暂时无法开票，请联系客服400-xxxx-xxxx', - nzFooter: [ - { - label: '关闭', - type: 'primary', - onClick: () => { - modal.destroy(); - } - } - ] + auditAction() { + if (this.selectedRows?.length <= 0) { + this.service.msgSrv.warning('请选择申请记录'); + return; + } + const modal = this.nzModalService.warning({ + nzTitle: '确定对已选运单批量申请开票？', + nzOnOk: () => {} }); } @@ -213,4 +70,149 @@ export class ETCInvoicedRequestedComponent implements OnInit { this._$expand = !this._$expand; this.sf?.setValue('/expand', this._$expand); } + + private initSF(): SFSchema { + return { + properties: { + expand: { + type: 'boolean', + ui: { + hidden: true + } + }, + orderSn: { + type: 'string', + title: '运单号', + ui: { + autocomplete: 'off', + placeholder: '请输入' + } + }, + orderS2n: { + type: 'string', + title: '订单号', + ui: { + autocomplete: 'off', + placeholder: '请输入' + } + }, + order2S2n: { + type: 'string', + title: '订单类型', + ui: { + widget: 'dict-select', + params: { dictKey: 'refund:apply:status' }, + placeholder: '请选择' + } + }, + orderSn1: { + type: 'string', + title: '司机姓名', + ui: { + placeholder: '请输入', + visibleIf: { + expand: (value: boolean) => value + } + } + }, + ord0erSn1: { + type: 'string', + title: '司机手机', + ui: { + placeholder: '请输入', + visibleIf: { + expand: (value: boolean) => value + } + } + }, + orderSn2: { + type: 'string', + title: '车牌号', + ui: { + placeholder: '请输入', + visibleIf: { + expand: (value: boolean) => value + } + } + }, + orderS1n2: { + type: 'string', + title: '车辆所有人', + ui: { + placeholder: '请输入', + visibleIf: { + expand: (value: boolean) => value + } + } + }, + orderS3: { + type: 'string', + title: '卸货地', + ui: { + autocomplete: 'off', + placeholder: '请选择', + visibleIf: { + expand: (value: boolean) => value + } + } + }, + orderSn4: { + type: 'string', + title: '装货地', + ui: { + autocomplete: 'off', + placeholder: '请选择', + visibleIf: { + expand: (value: boolean) => value + } + } + }, + orderSn5: { + type: 'string', + title: '托运人', + enum: [{ label: '全部', value: '全部' }], + ui: { + widget: 'select', + placeholder: '请选择', + visibleIf: { + expand: (value: boolean) => value + } + } + }, + ltdId: { + type: 'string', + title: '网络货运人', + ui: { + widget: 'select', + placeholder: '请选择', + allowClear: true, + visibleIf: { + expand: (value: boolean) => value + }, + asyncData: () => this.service.getNetworkFreightForwarder() + }, + default: '' + } + } + }; + } + + private initST(): STColumn[] { + return [ + { title: '', index: 'key', type: 'checkbox' }, + { title: '运单号', index: 'no' }, + { title: '订单号', index: 'no' }, + { title: '订单类型', index: 'no' }, + { title: '装货地', index: 'callNo' }, + { title: '卸货地', index: 'callNo' }, + { title: '司机信息', render: 'call1No' }, + { title: '车辆信息', render: 'call1N2o' }, + { title: '托运人', index: 'callNo' }, + { title: '网络货运人', index: 'callNo' }, + { title: '接单时间', index: 'updatedAt', type: 'date' }, + { title: '装货时间', index: 'updatedAt', type: 'date' }, + { title: '卸货时间', index: 'updatedAt', type: 'date' }, + { title: '签收时间', index: 'updatedAt', type: 'date' } + ]; + } } diff --git a/src/app/routes/ticket-management/ticket-management.module.ts b/src/app/routes/ticket-management/ticket-management.module.ts index 0bcbcbca..a5ad88b3 100644 --- a/src/app/routes/ticket-management/ticket-management.module.ts +++ b/src/app/routes/ticket-management/ticket-management.module.ts @@ -15,6 +15,8 @@ import { RequestedDetailComponent } from './components/invoice-requested/request import { InvoiceDetailComponent } from './components/invoice-detail/invoice-detail.component'; import { CancellationInvoiceComponent } from './components/cancellation-invoice/cancellation-invoice.component'; import { PushInvoiceComponent } from './components/cancellation-invoice/push-invoice/push-invoice.component'; +import { AddOwnerComponent } from './components/etc-blacklist/add-owner/add-owner.component'; +import { AddCartComponent } from './components/etc-blacklist/add-cart/add-cart.component'; const COMPONENTS: any = [ ETCInvoicedListComponent, @@ -25,11 +27,18 @@ const COMPONENTS: any = [ InvoicedListComponent, InvoiceRequestedDetailComponent, InvoiceDetailComponent, - CancellationInvoiceComponent + CancellationInvoiceComponent, + PushInvoiceComponent +]; +const NOTROUTECOMPONENTS: any = [ + TransactionDetailsComponent, + RequestedInvoiceModalComponent, + RequestedDetailComponent, + AddOwnerComponent, + AddCartComponent ]; -const NOTROUTECOMPONENTS: any = [TransactionDetailsComponent, RequestedInvoiceModalComponent, RequestedDetailComponent]; @NgModule({ - declarations: [...COMPONENTS, ...NOTROUTECOMPONENTS, PushInvoiceComponent], + declarations: [...COMPONENTS, ...NOTROUTECOMPONENTS], imports: [CommonModule, TicketManagementRoutingModule, SharedModule] }) export class TicketManagementModule {} diff --git a/src/assets/mocks/menu-data.json b/src/assets/mocks/menu-data.json index 292d338e..c14fe9ef 100644 --- a/src/assets/mocks/menu-data.json +++ b/src/assets/mocks/menu-data.json @@ -360,7 +360,7 @@ "link": "/ticket/etc-invoice-requested" }, { - "text": "运单开票记录", + "text": "开票记录", "link": "/ticket/etc-invoice-list" }, { @@ -368,7 +368,7 @@ "link": "/ticket/etc-invoiced-logs" }, { - "text": "黑名单", + "text": "ETC白名单", "link": "/ticket/etc-blacklist" } ] From b6755ec49f872fde57d05bb78309dbd416529355 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Wed, 5 Jan 2022 19:06:38 +0800 Subject: [PATCH 4/7] edit --- .../selected-captain.component.html | 15 ++++ .../selected-captain.component.ts | 79 +++++++++++++++++++ .../selected-driver.component.html | 1 + .../selected-driver.component.ts | 14 ++++ .../selected-freight.component.html | 1 + .../selected-freight.component.ts | 14 ++++ .../selected-network-freight.component.html | 1 + .../selected-network-freight.component.ts | 14 ++++ .../routes/sys-setting/sys-setting.module.ts | 2 +- .../add-cart/add-cart.component.less | 0 .../add-cart/add-cart.component.ts | 1 - .../add-owner/add-owner.component.less | 0 .../add-owner/add-owner.component.ts | 3 +- 13 files changed, 141 insertions(+), 4 deletions(-) create mode 100644 src/app/routes/sys-setting/components/basic-setting/selected-captain/selected-captain.component.html create mode 100644 src/app/routes/sys-setting/components/basic-setting/selected-captain/selected-captain.component.ts create mode 100644 src/app/routes/sys-setting/components/basic-setting/selected-driver/selected-driver.component.html create mode 100644 src/app/routes/sys-setting/components/basic-setting/selected-driver/selected-driver.component.ts create mode 100644 src/app/routes/sys-setting/components/basic-setting/selected-freight/selected-freight.component.html create mode 100644 src/app/routes/sys-setting/components/basic-setting/selected-freight/selected-freight.component.ts create mode 100644 src/app/routes/sys-setting/components/basic-setting/selected-network-freight/selected-network-freight.component.html create mode 100644 src/app/routes/sys-setting/components/basic-setting/selected-network-freight/selected-network-freight.component.ts delete mode 100644 src/app/routes/ticket-management/components/etc-blacklist/add-cart/add-cart.component.less delete mode 100644 src/app/routes/ticket-management/components/etc-blacklist/add-owner/add-owner.component.less diff --git a/src/app/routes/sys-setting/components/basic-setting/selected-captain/selected-captain.component.html b/src/app/routes/sys-setting/components/basic-setting/selected-captain/selected-captain.component.html new file mode 100644 index 00000000..795a114d --- /dev/null +++ b/src/app/routes/sys-setting/components/basic-setting/selected-captain/selected-captain.component.html @@ -0,0 +1,15 @@ +
+
+ +
+
+ + +
+ + +
\ No newline at end of file diff --git a/src/app/routes/sys-setting/components/basic-setting/selected-captain/selected-captain.component.ts b/src/app/routes/sys-setting/components/basic-setting/selected-captain/selected-captain.component.ts new file mode 100644 index 00000000..51332416 --- /dev/null +++ b/src/app/routes/sys-setting/components/basic-setting/selected-captain/selected-captain.component.ts @@ -0,0 +1,79 @@ +import { Component, OnInit, ViewChild } from '@angular/core'; +import { Router } from '@angular/router'; +import { STComponent, STColumn, STRequestOptions, STChange } from '@delon/abc/st'; +import { SFComponent, SFSchema } from '@delon/form'; +import { NzModalService } from 'ng-zorro-antd/modal'; +import { TicketService } from 'src/app/routes/ticket-management/services/ticket.service'; + +@Component({ + selector: 'app-selected-captain', + templateUrl: './selected-captain.component.html' +}) +export class SelectedCaptainComponent implements OnInit { + data = []; + selectedData: any[] = []; + @ViewChild('st', { static: true }) + st!: STComponent; + @ViewChild('sf', { static: false }) + sf!: SFComponent; + columns: STColumn[] = [ + { title: '', index: 'key', type: 'checkbox' }, + { title: '企业名称', index: 'no' }, + { title: '联系人姓名', index: 'callNo' }, + { title: '联系人手机号', index: 'callNo' }, + { title: '认证状态', index: 'callNo' } + ]; + searchSchema: SFSchema = { + properties: { + params1: { + title: '', + type: 'string', + ui: { + placeholder: '请输入企业名称' + } + }, + params2: { + title: '', + type: 'string', + ui: { + placeholder: '请输入姓名' + } + }, + params3: { + title: '', + type: 'string', + ui: { + placeholder: '请输入手机号' + } + } + } + }; + + constructor(public service: TicketService, private nzModalService: NzModalService, private router: Router) {} + + ngOnInit(): void {} + + beforeReq = (requestOptions: STRequestOptions) => { + if (this.sf) { + Object.assign(requestOptions.body, { + ...this.sf.value + }); + } + return requestOptions; + }; + + stChange(e: STChange): void { + switch (e.type) { + case 'checkbox': + this.selectedData = e.checkbox!; + break; + } + } + + /** + * 重置表单 + */ + resetSF() { + this.sf.reset(); + } +} diff --git a/src/app/routes/sys-setting/components/basic-setting/selected-driver/selected-driver.component.html b/src/app/routes/sys-setting/components/basic-setting/selected-driver/selected-driver.component.html new file mode 100644 index 00000000..eeea6818 --- /dev/null +++ b/src/app/routes/sys-setting/components/basic-setting/selected-driver/selected-driver.component.html @@ -0,0 +1 @@ +

selected-driver works!

diff --git a/src/app/routes/sys-setting/components/basic-setting/selected-driver/selected-driver.component.ts b/src/app/routes/sys-setting/components/basic-setting/selected-driver/selected-driver.component.ts new file mode 100644 index 00000000..e028f40e --- /dev/null +++ b/src/app/routes/sys-setting/components/basic-setting/selected-driver/selected-driver.component.ts @@ -0,0 +1,14 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-selected-driver', + templateUrl: './selected-driver.component.html', +}) +export class SelectedDriverComponent implements OnInit { + + constructor() { } + + ngOnInit(): void { + } + +} diff --git a/src/app/routes/sys-setting/components/basic-setting/selected-freight/selected-freight.component.html b/src/app/routes/sys-setting/components/basic-setting/selected-freight/selected-freight.component.html new file mode 100644 index 00000000..6fd5d774 --- /dev/null +++ b/src/app/routes/sys-setting/components/basic-setting/selected-freight/selected-freight.component.html @@ -0,0 +1 @@ +

selected-freight works!

diff --git a/src/app/routes/sys-setting/components/basic-setting/selected-freight/selected-freight.component.ts b/src/app/routes/sys-setting/components/basic-setting/selected-freight/selected-freight.component.ts new file mode 100644 index 00000000..9457f20f --- /dev/null +++ b/src/app/routes/sys-setting/components/basic-setting/selected-freight/selected-freight.component.ts @@ -0,0 +1,14 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-selected-freight', + templateUrl: './selected-freight.component.html', +}) +export class SelectedFreightComponent implements OnInit { + + constructor() { } + + ngOnInit(): void { + } + +} diff --git a/src/app/routes/sys-setting/components/basic-setting/selected-network-freight/selected-network-freight.component.html b/src/app/routes/sys-setting/components/basic-setting/selected-network-freight/selected-network-freight.component.html new file mode 100644 index 00000000..410b58b2 --- /dev/null +++ b/src/app/routes/sys-setting/components/basic-setting/selected-network-freight/selected-network-freight.component.html @@ -0,0 +1 @@ +

selected-network-freight works!

diff --git a/src/app/routes/sys-setting/components/basic-setting/selected-network-freight/selected-network-freight.component.ts b/src/app/routes/sys-setting/components/basic-setting/selected-network-freight/selected-network-freight.component.ts new file mode 100644 index 00000000..addc95c9 --- /dev/null +++ b/src/app/routes/sys-setting/components/basic-setting/selected-network-freight/selected-network-freight.component.ts @@ -0,0 +1,14 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-selected-network-freight', + templateUrl: './selected-network-freight.component.html', +}) +export class SelectedNetworkFreightComponent implements OnInit { + + constructor() { } + + ngOnInit(): void { + } + +} diff --git a/src/app/routes/sys-setting/sys-setting.module.ts b/src/app/routes/sys-setting/sys-setting.module.ts index 74883e8c..3bf9d1f7 100644 --- a/src/app/routes/sys-setting/sys-setting.module.ts +++ b/src/app/routes/sys-setting/sys-setting.module.ts @@ -61,7 +61,7 @@ const NOTROUTECOMPONENTS = [ AuditResonConfigActionModalComponent, CartConfigActionModalComponent, SettingRoleEditComponent, - SettingMenuComponent + SettingMenuComponent, ]; @NgModule({ declarations: [...COMPONENTS, ...NOTROUTECOMPONENTS], diff --git a/src/app/routes/ticket-management/components/etc-blacklist/add-cart/add-cart.component.less b/src/app/routes/ticket-management/components/etc-blacklist/add-cart/add-cart.component.less deleted file mode 100644 index e69de29b..00000000 diff --git a/src/app/routes/ticket-management/components/etc-blacklist/add-cart/add-cart.component.ts b/src/app/routes/ticket-management/components/etc-blacklist/add-cart/add-cart.component.ts index 2bb9cd6c..afcbedd7 100644 --- a/src/app/routes/ticket-management/components/etc-blacklist/add-cart/add-cart.component.ts +++ b/src/app/routes/ticket-management/components/etc-blacklist/add-cart/add-cart.component.ts @@ -8,7 +8,6 @@ import { TicketService } from '../../../services/ticket.service'; @Component({ selector: 'app-add-cart', templateUrl: './add-cart.component.html', - styleUrls: ['./add-cart.component.less'] }) export class AddCartComponent implements OnInit { data = []; diff --git a/src/app/routes/ticket-management/components/etc-blacklist/add-owner/add-owner.component.less b/src/app/routes/ticket-management/components/etc-blacklist/add-owner/add-owner.component.less deleted file mode 100644 index e69de29b..00000000 diff --git a/src/app/routes/ticket-management/components/etc-blacklist/add-owner/add-owner.component.ts b/src/app/routes/ticket-management/components/etc-blacklist/add-owner/add-owner.component.ts index d5dc8e27..1d63fcef 100644 --- a/src/app/routes/ticket-management/components/etc-blacklist/add-owner/add-owner.component.ts +++ b/src/app/routes/ticket-management/components/etc-blacklist/add-owner/add-owner.component.ts @@ -7,8 +7,7 @@ import { TicketService } from '../../../services/ticket.service'; @Component({ selector: 'app-add-owner', - templateUrl: './add-owner.component.html', - styleUrls: ['./add-owner.component.less'] + templateUrl: './add-owner.component.html' }) export class AddOwnerComponent implements OnInit { data = []; From ecce96705e28620a872c68c1ec4e9733886189c7 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Wed, 5 Jan 2022 19:43:04 +0800 Subject: [PATCH 5/7] edit --- .../withdrawals-detail/withdrawals-detail.component.html | 2 +- .../withdrawals-detail/withdrawals-detail.component.ts | 8 -------- .../withdrawals-record/withdrawals-record.component.ts | 2 +- 3 files changed, 2 insertions(+), 10 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 a1fa2b74..6fdf55fc 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 @@ -28,7 +28,7 @@ {{formData?.virtualAccount}} - {{refundStatus[formData?.virtualAccount]}} + {{formData?.refundStatusLabel}} {{formData?.amount}} 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 eee41855..1c789121 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 @@ -12,14 +12,6 @@ export class WithdrawalsDetailComponent implements OnInit { timeLineData: any = []; - refundStatus: any = { - '1': '待审核', - '2': '提现中', - '3': '提现成功', - '4': '拒绝提现', - '5': '提现失败' - }; - constructor(public service: FreightAccountService, private route: ActivatedRoute) { const id = route.snapshot.params.id; this.loadRefundDetail(id); 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 94298f3e..a1fe9788 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 @@ -242,7 +242,7 @@ export class WithdrawalsRecordComponent implements OnInit { { title: '', index: 'key', type: 'checkbox' }, { title: '提现时间', index: 'createTime', width: 180 }, { title: '提现单号', index: 'refundApplyCode', width: 120 }, - { title: '网络货运人', index: 'ltdname', width: 120 }, + { title: '网络货运人', index: 'ltdName', width: 120 }, { title: '银行类型', index: 'bankTypeLabel', width: 100 }, { title: '账户类型', index: 'accountType', width: 100 }, { title: '账户名称', index: 'bankAccountName', width: 100 }, From 7d07ca73dcdcefe0164555086120d9226fc57a73 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Wed, 5 Jan 2022 20:03:53 +0800 Subject: [PATCH 6/7] edit --- .../withdrawals-detail/withdrawals-detail.component.html | 2 +- .../staff-management/staff-modal/staff-modal.component.ts | 3 +-- 2 files changed, 2 insertions(+), 3 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 6fdf55fc..7c99a5aa 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 @@ -10,7 +10,7 @@
- {{formData?.ltdname}} + {{formData?.ltdName}} {{formData?.bankType==='1'?'平安银行':'浦发银行'}} diff --git a/src/app/routes/sys-setting/components/staff-management/staff-modal/staff-modal.component.ts b/src/app/routes/sys-setting/components/staff-management/staff-modal/staff-modal.component.ts index 1fb167e4..48c1b0d7 100644 --- a/src/app/routes/sys-setting/components/staff-management/staff-modal/staff-modal.component.ts +++ b/src/app/routes/sys-setting/components/staff-management/staff-modal/staff-modal.component.ts @@ -79,8 +79,7 @@ export class SystemStaffStaffModalComponent implements OnInit { } if (this.i.userId === 0) { const params: any = { - ...this.sf.value, - enterpriseId: 0 + ...this.sf.value }; this.service.request(this.service.$api_add_staff, params).subscribe(res => { if (res) { From e4c007f0d50a4cb90f41ca9c6019df8663591d97 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Wed, 5 Jan 2022 20:05:41 +0800 Subject: [PATCH 7/7] edit --- .../basic-setting.component.html | 4 +- .../selected-captain.component.html | 15 ---- .../selected-captain.component.ts | 79 ------------------- .../selected-driver.component.html | 1 - .../selected-driver.component.ts | 14 ---- .../selected-freight.component.html | 1 - .../selected-freight.component.ts | 14 ---- .../selected-network-freight.component.html | 1 - .../selected-network-freight.component.ts | 14 ---- 9 files changed, 2 insertions(+), 141 deletions(-) delete mode 100644 src/app/routes/sys-setting/components/basic-setting/selected-captain/selected-captain.component.html delete mode 100644 src/app/routes/sys-setting/components/basic-setting/selected-captain/selected-captain.component.ts delete mode 100644 src/app/routes/sys-setting/components/basic-setting/selected-driver/selected-driver.component.html delete mode 100644 src/app/routes/sys-setting/components/basic-setting/selected-driver/selected-driver.component.ts delete mode 100644 src/app/routes/sys-setting/components/basic-setting/selected-freight/selected-freight.component.html delete mode 100644 src/app/routes/sys-setting/components/basic-setting/selected-freight/selected-freight.component.ts delete mode 100644 src/app/routes/sys-setting/components/basic-setting/selected-network-freight/selected-network-freight.component.html delete mode 100644 src/app/routes/sys-setting/components/basic-setting/selected-network-freight/selected-network-freight.component.ts diff --git a/src/app/routes/sys-setting/components/basic-setting/basic-setting.component.html b/src/app/routes/sys-setting/components/basic-setting/basic-setting.component.html index c1e39229..7ab9b34d 100644 --- a/src/app/routes/sys-setting/components/basic-setting/basic-setting.component.html +++ b/src/app/routes/sys-setting/components/basic-setting/basic-setting.component.html @@ -50,7 +50,7 @@ - +
diff --git a/src/app/routes/sys-setting/components/basic-setting/selected-captain/selected-captain.component.html b/src/app/routes/sys-setting/components/basic-setting/selected-captain/selected-captain.component.html deleted file mode 100644 index 795a114d..00000000 --- a/src/app/routes/sys-setting/components/basic-setting/selected-captain/selected-captain.component.html +++ /dev/null @@ -1,15 +0,0 @@ -
-
- -
-
- - -
- - -
\ No newline at end of file diff --git a/src/app/routes/sys-setting/components/basic-setting/selected-captain/selected-captain.component.ts b/src/app/routes/sys-setting/components/basic-setting/selected-captain/selected-captain.component.ts deleted file mode 100644 index 51332416..00000000 --- a/src/app/routes/sys-setting/components/basic-setting/selected-captain/selected-captain.component.ts +++ /dev/null @@ -1,79 +0,0 @@ -import { Component, OnInit, ViewChild } from '@angular/core'; -import { Router } from '@angular/router'; -import { STComponent, STColumn, STRequestOptions, STChange } from '@delon/abc/st'; -import { SFComponent, SFSchema } from '@delon/form'; -import { NzModalService } from 'ng-zorro-antd/modal'; -import { TicketService } from 'src/app/routes/ticket-management/services/ticket.service'; - -@Component({ - selector: 'app-selected-captain', - templateUrl: './selected-captain.component.html' -}) -export class SelectedCaptainComponent implements OnInit { - data = []; - selectedData: any[] = []; - @ViewChild('st', { static: true }) - st!: STComponent; - @ViewChild('sf', { static: false }) - sf!: SFComponent; - columns: STColumn[] = [ - { title: '', index: 'key', type: 'checkbox' }, - { title: '企业名称', index: 'no' }, - { title: '联系人姓名', index: 'callNo' }, - { title: '联系人手机号', index: 'callNo' }, - { title: '认证状态', index: 'callNo' } - ]; - searchSchema: SFSchema = { - properties: { - params1: { - title: '', - type: 'string', - ui: { - placeholder: '请输入企业名称' - } - }, - params2: { - title: '', - type: 'string', - ui: { - placeholder: '请输入姓名' - } - }, - params3: { - title: '', - type: 'string', - ui: { - placeholder: '请输入手机号' - } - } - } - }; - - constructor(public service: TicketService, private nzModalService: NzModalService, private router: Router) {} - - ngOnInit(): void {} - - beforeReq = (requestOptions: STRequestOptions) => { - if (this.sf) { - Object.assign(requestOptions.body, { - ...this.sf.value - }); - } - return requestOptions; - }; - - stChange(e: STChange): void { - switch (e.type) { - case 'checkbox': - this.selectedData = e.checkbox!; - break; - } - } - - /** - * 重置表单 - */ - resetSF() { - this.sf.reset(); - } -} diff --git a/src/app/routes/sys-setting/components/basic-setting/selected-driver/selected-driver.component.html b/src/app/routes/sys-setting/components/basic-setting/selected-driver/selected-driver.component.html deleted file mode 100644 index eeea6818..00000000 --- a/src/app/routes/sys-setting/components/basic-setting/selected-driver/selected-driver.component.html +++ /dev/null @@ -1 +0,0 @@ -

selected-driver works!

diff --git a/src/app/routes/sys-setting/components/basic-setting/selected-driver/selected-driver.component.ts b/src/app/routes/sys-setting/components/basic-setting/selected-driver/selected-driver.component.ts deleted file mode 100644 index e028f40e..00000000 --- a/src/app/routes/sys-setting/components/basic-setting/selected-driver/selected-driver.component.ts +++ /dev/null @@ -1,14 +0,0 @@ -import { Component, OnInit } from '@angular/core'; - -@Component({ - selector: 'app-selected-driver', - templateUrl: './selected-driver.component.html', -}) -export class SelectedDriverComponent implements OnInit { - - constructor() { } - - ngOnInit(): void { - } - -} diff --git a/src/app/routes/sys-setting/components/basic-setting/selected-freight/selected-freight.component.html b/src/app/routes/sys-setting/components/basic-setting/selected-freight/selected-freight.component.html deleted file mode 100644 index 6fd5d774..00000000 --- a/src/app/routes/sys-setting/components/basic-setting/selected-freight/selected-freight.component.html +++ /dev/null @@ -1 +0,0 @@ -

selected-freight works!

diff --git a/src/app/routes/sys-setting/components/basic-setting/selected-freight/selected-freight.component.ts b/src/app/routes/sys-setting/components/basic-setting/selected-freight/selected-freight.component.ts deleted file mode 100644 index 9457f20f..00000000 --- a/src/app/routes/sys-setting/components/basic-setting/selected-freight/selected-freight.component.ts +++ /dev/null @@ -1,14 +0,0 @@ -import { Component, OnInit } from '@angular/core'; - -@Component({ - selector: 'app-selected-freight', - templateUrl: './selected-freight.component.html', -}) -export class SelectedFreightComponent implements OnInit { - - constructor() { } - - ngOnInit(): void { - } - -} diff --git a/src/app/routes/sys-setting/components/basic-setting/selected-network-freight/selected-network-freight.component.html b/src/app/routes/sys-setting/components/basic-setting/selected-network-freight/selected-network-freight.component.html deleted file mode 100644 index 410b58b2..00000000 --- a/src/app/routes/sys-setting/components/basic-setting/selected-network-freight/selected-network-freight.component.html +++ /dev/null @@ -1 +0,0 @@ -

selected-network-freight works!

diff --git a/src/app/routes/sys-setting/components/basic-setting/selected-network-freight/selected-network-freight.component.ts b/src/app/routes/sys-setting/components/basic-setting/selected-network-freight/selected-network-freight.component.ts deleted file mode 100644 index addc95c9..00000000 --- a/src/app/routes/sys-setting/components/basic-setting/selected-network-freight/selected-network-freight.component.ts +++ /dev/null @@ -1,14 +0,0 @@ -import { Component, OnInit } from '@angular/core'; - -@Component({ - selector: 'app-selected-network-freight', - templateUrl: './selected-network-freight.component.html', -}) -export class SelectedNetworkFreightComponent implements OnInit { - - constructor() { } - - ngOnInit(): void { - } - -}